Pārlūkot izejas kodu

Update gci format

世界 3 gadi atpakaļ
vecāks
revīzija
3696e81eb4
55 mainītis faili ar 194 papildinājumiem un 124 dzēšanām
  1. 2 1
      adapter/router.go
  2. 3 1
      cmd/sing-box/cmd_check.go
  3. 2 1
      cmd/sing-box/cmd_format.go
  4. 3 1
      cmd/sing-box/cmd_run.go
  5. 3 1
      cmd/sing-box/cmd_version.go
  6. 1 0
      cmd/sing-box/main.go
  7. 2 1
      common/badjson/array.go
  8. 2 1
      common/badjson/json.go
  9. 2 1
      common/badjson/object.go
  10. 2 1
      common/geoip/reader.go
  11. 4 2
      common/sniff/dns.go
  12. 2 1
      common/sniff/http.go
  13. 1 0
      common/sniff/quic.go
  14. 2 1
      common/sniff/tls.go
  15. 1 1
      format.go
  16. 4 3
      inbound/builder.go
  17. 7 5
      inbound/default.go
  18. 5 4
      inbound/direct.go
  19. 4 3
      inbound/http.go
  20. 5 4
      inbound/mixed.go
  21. 9 7
      inbound/shadowsocks.go
  22. 8 6
      inbound/shadowsocks_multi.go
  23. 8 6
      inbound/shadowsocks_relay.go
  24. 4 3
      inbound/socks.go
  25. 3 1
      log/logrus.go
  26. 2 1
      log/logrus_hook.go
  27. 2 1
      option/config.go
  28. 4 2
      option/inbound.go
  29. 4 2
      option/json.go
  30. 4 2
      option/outbound.go
  31. 4 2
      option/route.go
  32. 4 2
      option/types.go
  33. 3 2
      outbound/block.go
  34. 4 3
      outbound/builder.go
  35. 2 1
      outbound/default.go
  36. 5 3
      outbound/dialer/default.go
  37. 3 2
      outbound/dialer/detour.go
  38. 3 2
      outbound/dialer/dialer.go
  39. 3 2
      outbound/dialer/override.go
  40. 4 3
      outbound/direct.go
  41. 5 4
      outbound/http.go
  42. 8 6
      outbound/shadowsocks.go
  43. 5 4
      outbound/socks.go
  44. 8 7
      route/router.go
  45. 4 3
      route/rule.go
  46. 2 1
      route/rule_cidr.go
  47. 2 1
      route/rule_domain.go
  48. 2 1
      route/rule_domain_regex.go
  49. 2 1
      route/rule_geoip.go
  50. 2 1
      route/rule_geosite.go
  51. 2 1
      route/rule_inbound.go
  52. 4 3
      route/rule_logical.go
  53. 2 1
      route/rule_port.go
  54. 2 1
      route/rule_protocol.go
  55. 4 3
      service.go

+ 2 - 1
adapter/router.go

@@ -4,9 +4,10 @@ import (
 	"context"
 	"net"
 
+	N "github.com/sagernet/sing/common/network"
+
 	"github.com/sagernet/sing-box/common/geoip"
 	"github.com/sagernet/sing-box/common/geosite"
-	N "github.com/sagernet/sing/common/network"
 )
 
 type Router interface {

+ 3 - 1
cmd/sing-box/cmd_check.go

@@ -4,9 +4,11 @@ import (
 	"context"
 	"os"
 
-	"github.com/goccy/go-json"
 	"github.com/sagernet/sing-box"
+
 	"github.com/sagernet/sing-box/option"
+
+	"github.com/goccy/go-json"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

+ 2 - 1
cmd/sing-box/cmd_format.go

@@ -5,8 +5,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/goccy/go-json"
 	"github.com/sagernet/sing-box/option"
+
+	"github.com/goccy/go-json"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

+ 3 - 1
cmd/sing-box/cmd_run.go

@@ -6,9 +6,11 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/goccy/go-json"
 	"github.com/sagernet/sing-box"
+
 	"github.com/sagernet/sing-box/option"
+
+	"github.com/goccy/go-json"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

+ 3 - 1
cmd/sing-box/cmd_version.go

@@ -4,8 +4,10 @@ import (
 	"os"
 	"runtime"
 
-	C "github.com/sagernet/sing-box/constant"
 	F "github.com/sagernet/sing/common/format"
+
+	C "github.com/sagernet/sing-box/constant"
+
 	"github.com/spf13/cobra"
 )
 

+ 1 - 0
cmd/sing-box/main.go

@@ -4,6 +4,7 @@ import (
 	"os"
 
 	"github.com/sagernet/sing-box/log"
+
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

+ 2 - 1
common/badjson/array.go

@@ -3,8 +3,9 @@ package badjson
 import (
 	"bytes"
 
-	"github.com/goccy/go-json"
 	E "github.com/sagernet/sing/common/exceptions"
+
+	"github.com/goccy/go-json"
 )
 
 type JSONArray[T any] []T

+ 2 - 1
common/badjson/json.go

@@ -1,8 +1,9 @@
 package badjson
 
 import (
-	"github.com/goccy/go-json"
 	E "github.com/sagernet/sing/common/exceptions"
+
+	"github.com/goccy/go-json"
 )
 
 func decodeJSON(decoder *json.Decoder) (any, error) {

+ 2 - 1
common/badjson/object.go

@@ -4,9 +4,10 @@ import (
 	"bytes"
 	"strings"
 
-	"github.com/goccy/go-json"
 	E "github.com/sagernet/sing/common/exceptions"
 	"github.com/sagernet/sing/common/x/linkedhashmap"
+
+	"github.com/goccy/go-json"
 )
 
 type JSONObject struct {

+ 2 - 1
common/geoip/reader.go

@@ -3,9 +3,10 @@ package geoip
 import (
 	"net/netip"
 
-	"github.com/oschwald/maxminddb-golang"
 	E "github.com/sagernet/sing/common/exceptions"
 	N "github.com/sagernet/sing/common/network"
+
+	"github.com/oschwald/maxminddb-golang"
 )
 
 type Reader struct {

+ 4 - 2
common/sniff/dns.go

@@ -7,11 +7,13 @@ import (
 	"os"
 	"time"
 
-	"github.com/sagernet/sing-box/adapter"
-	C "github.com/sagernet/sing-box/constant"
 	"github.com/sagernet/sing/common"
 	"github.com/sagernet/sing/common/buf"
 	"github.com/sagernet/sing/common/task"
+
+	"github.com/sagernet/sing-box/adapter"
+	C "github.com/sagernet/sing-box/constant"
+
 	"golang.org/x/net/dns/dnsmessage"
 )
 

+ 2 - 1
common/sniff/http.go

@@ -5,9 +5,10 @@ import (
 	"context"
 	"io"
 
+	"github.com/sagernet/sing/protocol/http"
+
 	"github.com/sagernet/sing-box/adapter"
 	C "github.com/sagernet/sing-box/constant"
-	"github.com/sagernet/sing/protocol/http"
 )
 
 func HTTPHost(ctx context.Context, reader io.Reader) (*adapter.InboundContext, error) {

+ 1 - 0
common/sniff/quic.go

@@ -12,6 +12,7 @@ import (
 	"github.com/sagernet/sing-box/adapter"
 	"github.com/sagernet/sing-box/common/sniff/internal/qtls"
 	C "github.com/sagernet/sing-box/constant"
+
 	"golang.org/x/crypto/hkdf"
 )
 

+ 2 - 1
common/sniff/tls.go

@@ -5,9 +5,10 @@ import (
 	"crypto/tls"
 	"io"
 
+	"github.com/sagernet/sing/common/bufio"
+
 	"github.com/sagernet/sing-box/adapter"
 	C "github.com/sagernet/sing-box/constant"
-	"github.com/sagernet/sing/common/bufio"
 )
 
 func TLSClientHello(ctx context.Context, reader io.Reader) (*adapter.InboundContext, error) {

+ 1 - 1
format.go

@@ -4,4 +4,4 @@ package box
 //go:generate go install -v github.com/daixiang0/gci@latest
 //go:generate gofumpt -l -w .
 //go:generate gofmt -s -w .
-//go:generate gci write .
+//go:generate gci write -s "standard,prefix(github.com/sagernet/sing/),prefix(github.com/sagernet),prefix(github.com/sagernet/sing-box/),default" .

+ 4 - 3
inbound/builder.go

@@ -3,13 +3,14 @@ package inbound
 import (
 	"context"
 
+	"github.com/sagernet/sing/common"
+	E "github.com/sagernet/sing/common/exceptions"
+	F "github.com/sagernet/sing/common/format"
+
 	"github.com/sagernet/sing-box/adapter"
 	C "github.com/sagernet/sing-box/constant"
 	"github.com/sagernet/sing-box/log"
 	"github.com/sagernet/sing-box/option"
-	"github.com/sagernet/sing/common"
-	E "github.com/sagernet/sing/common/exceptions"
-	F "github.com/sagernet/sing/common/format"
 )
 
 func New(ctx context.Context, router adapter.Router, logger log.Logger, index int, options option.Inbound) (adapter.Inbound, error) {

+ 7 - 5
inbound/default.go

@@ -8,16 +8,18 @@ import (
 	"sync"
 	"time"
 
-	"github.com/database64128/tfo-go"
-	"github.com/sagernet/sing-box/adapter"
-	C "github.com/sagernet/sing-box/constant"
-	"github.com/sagernet/sing-box/log"
-	"github.com/sagernet/sing-box/option"
 	"github.com/sagernet/sing/common"
 	"github.com/sagernet/sing/common/buf"
 	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-box/adapter"
+	C "github.com/sagernet/sing-box/constant"
+	"github.com/sagernet/sing-box/log"
+	"github.com/sagernet/sing-box/option"
+
+	"github.com/database64128/tfo-go"
 )
 
 var _ adapter.Inbound = (*myInboundAdapter)(nil)

+ 5 - 4
inbound/direct.go

@@ -5,14 +5,15 @@ import (
 	"net"
 	"net/netip"
 
-	"github.com/sagernet/sing-box/adapter"
-	C "github.com/sagernet/sing-box/constant"
-	"github.com/sagernet/sing-box/log"
-	"github.com/sagernet/sing-box/option"
 	"github.com/sagernet/sing/common/buf"
 	M "github.com/sagernet/sing/common/metadata"
 	N "github.com/sagernet/sing/common/network"
 	"github.com/sagernet/sing/common/udpnat"
+
+	"github.com/sagernet/sing-box/adapter"
+	C "github.com/sagernet/sing-box/constant"
+	"github.com/sagernet/sing-box/log"
+	"github.com/sagernet/sing-box/option"
 )
 
 var _ adapter.Inbound = (*Direct)(nil)

+ 4 - 3
inbound/http.go

@@ -5,13 +5,14 @@ import (
 	"context"
 	"net"
 
+	"github.com/sagernet/sing/common/auth"
+	M "github.com/sagernet/sing/common/metadata"
+	"github.com/sagernet/sing/protocol/http"
+
 	"github.com/sagernet/sing-box/adapter"
 	C "github.com/sagernet/sing-box/constant"
 	"github.com/sagernet/sing-box/log"
 	"github.com/sagernet/sing-box/option"
-	"github.com/sagernet/sing/common/auth"
-	M "github.com/sagernet/sing/common/metadata"
-	"github.com/sagernet/sing/protocol/http"
 )
 
 var _ adapter.Inbound = (*HTTP)(nil)

+ 5 - 4
inbound/mixed.go

@@ -5,10 +5,6 @@ import (
 	"context"
 	"net"
 
-	"github.com/sagernet/sing-box/adapter"
-	C "github.com/sagernet/sing-box/constant"
-	"github.com/sagernet/sing-box/log"
-	"github.com/sagernet/sing-box/option"
 	"github.com/sagernet/sing/common/auth"
 	"github.com/sagernet/sing/common/buf"
 	"github.com/sagernet/sing/common/bufio"
@@ -18,6 +14,11 @@ import (
 	"github.com/sagernet/sing/protocol/socks"
 	"github.com/sagernet/sing/protocol/socks/socks4"
 	"github.com/sagernet/sing/protocol/socks/socks5"
+
+	"github.com/sagernet/sing-box/adapter"
+	C "github.com/sagernet/sing-box/constant"
+	"github.com/sagernet/sing-box/log"
+	"github.com/sagernet/sing-box/option"
 )
 
 var _ adapter.Inbound = (*Mixed)(nil)

+ 9 - 7
inbound/shadowsocks.go

@@ -4,17 +4,19 @@ import (
 	"context"
 	"net"
 
-	"github.com/sagernet/sing-box/adapter"
-	C "github.com/sagernet/sing-box/constant"
-	"github.com/sagernet/sing-box/log"
-	"github.com/sagernet/sing-box/option"
-	"github.com/sagernet/sing-shadowsocks"
-	"github.com/sagernet/sing-shadowsocks/shadowaead"
-	"github.com/sagernet/sing-shadowsocks/shadowaead_2022"
 	"github.com/sagernet/sing/common"
 	"github.com/sagernet/sing/common/buf"
 	E "github.com/sagernet/sing/common/exceptions"
 	N "github.com/sagernet/sing/common/network"
+
+	"github.com/sagernet/sing-shadowsocks"
+	"github.com/sagernet/sing-shadowsocks/shadowaead"
+	"github.com/sagernet/sing-shadowsocks/shadowaead_2022"
+
+	"github.com/sagernet/sing-box/adapter"
+	C "github.com/sagernet/sing-box/constant"
+	"github.com/sagernet/sing-box/log"
+	"github.com/sagernet/sing-box/option"
 )
 
 func NewShadowsocks(ctx context.Context, router adapter.Router, logger log.Logger, tag string, options option.ShadowsocksInboundOptions) (adapter.Inbound, error) {

+ 8 - 6
inbound/shadowsocks_multi.go

@@ -4,16 +4,18 @@ import (
 	"context"
 	"net"
 
-	"github.com/sagernet/sing-box/adapter"
-	C "github.com/sagernet/sing-box/constant"
-	"github.com/sagernet/sing-box/log"
-	"github.com/sagernet/sing-box/option"
-	"github.com/sagernet/sing-shadowsocks"
-	"github.com/sagernet/sing-shadowsocks/shadowaead_2022"
 	"github.com/sagernet/sing/common"
 	"github.com/sagernet/sing/common/buf"
 	F "github.com/sagernet/sing/common/format"
 	N "github.com/sagernet/sing/common/network"
+
+	"github.com/sagernet/sing-shadowsocks"
+	"github.com/sagernet/sing-shadowsocks/shadowaead_2022"
+
+	"github.com/sagernet/sing-box/adapter"
+	C "github.com/sagernet/sing-box/constant"
+	"github.com/sagernet/sing-box/log"
+	"github.com/sagernet/sing-box/option"
 )
 
 var _ adapter.Inbound = (*ShadowsocksMulti)(nil)

+ 8 - 6
inbound/shadowsocks_relay.go

@@ -4,16 +4,18 @@ import (
 	"context"
 	"net"
 
-	"github.com/sagernet/sing-box/adapter"
-	C "github.com/sagernet/sing-box/constant"
-	"github.com/sagernet/sing-box/log"
-	"github.com/sagernet/sing-box/option"
-	"github.com/sagernet/sing-shadowsocks"
-	"github.com/sagernet/sing-shadowsocks/shadowaead_2022"
 	"github.com/sagernet/sing/common"
 	"github.com/sagernet/sing/common/buf"
 	F "github.com/sagernet/sing/common/format"
 	N "github.com/sagernet/sing/common/network"
+
+	"github.com/sagernet/sing-shadowsocks"
+	"github.com/sagernet/sing-shadowsocks/shadowaead_2022"
+
+	"github.com/sagernet/sing-box/adapter"
+	C "github.com/sagernet/sing-box/constant"
+	"github.com/sagernet/sing-box/log"
+	"github.com/sagernet/sing-box/option"
 )
 
 var _ adapter.Inbound = (*ShadowsocksMulti)(nil)

+ 4 - 3
inbound/socks.go

@@ -4,13 +4,14 @@ import (
 	"context"
 	"net"
 
+	"github.com/sagernet/sing/common/auth"
+	M "github.com/sagernet/sing/common/metadata"
+	"github.com/sagernet/sing/protocol/socks"
+
 	"github.com/sagernet/sing-box/adapter"
 	C "github.com/sagernet/sing-box/constant"
 	"github.com/sagernet/sing-box/log"
 	"github.com/sagernet/sing-box/option"
-	"github.com/sagernet/sing/common/auth"
-	M "github.com/sagernet/sing/common/metadata"
-	"github.com/sagernet/sing/protocol/socks"
 )
 
 var _ adapter.Inbound = (*Socks)(nil)

+ 3 - 1
log/logrus.go

@@ -4,10 +4,12 @@ import (
 	"context"
 	"os"
 
-	"github.com/sagernet/sing-box/option"
 	"github.com/sagernet/sing/common"
 	E "github.com/sagernet/sing/common/exceptions"
 	F "github.com/sagernet/sing/common/format"
+
+	"github.com/sagernet/sing-box/option"
+
 	"github.com/sirupsen/logrus"
 )
 

+ 2 - 1
log/logrus_hook.go

@@ -1,8 +1,9 @@
 package log
 
 import (
-	"github.com/logrusorgru/aurora"
 	F "github.com/sagernet/sing/common/format"
+
+	"github.com/logrusorgru/aurora"
 	"github.com/sirupsen/logrus"
 )
 

+ 2 - 1
option/config.go

@@ -3,8 +3,9 @@ package option
 import (
 	"bytes"
 
-	"github.com/goccy/go-json"
 	"github.com/sagernet/sing/common"
+
+	"github.com/goccy/go-json"
 )
 
 type _Options struct {

+ 4 - 2
option/inbound.go

@@ -1,11 +1,13 @@
 package option
 
 import (
-	"github.com/goccy/go-json"
-	C "github.com/sagernet/sing-box/constant"
 	"github.com/sagernet/sing/common"
 	"github.com/sagernet/sing/common/auth"
 	E "github.com/sagernet/sing/common/exceptions"
+
+	C "github.com/sagernet/sing-box/constant"
+
+	"github.com/goccy/go-json"
 )
 
 type _Inbound struct {

+ 4 - 2
option/json.go

@@ -3,10 +3,12 @@ package option
 import (
 	"bytes"
 
-	"github.com/goccy/go-json"
-	"github.com/sagernet/sing-box/common/badjson"
 	"github.com/sagernet/sing/common"
 	E "github.com/sagernet/sing/common/exceptions"
+
+	"github.com/sagernet/sing-box/common/badjson"
+
+	"github.com/goccy/go-json"
 )
 
 func ToMap(v any) (*badjson.JSONObject, error) {

+ 4 - 2
option/outbound.go

@@ -1,10 +1,12 @@
 package option
 
 import (
-	"github.com/goccy/go-json"
-	C "github.com/sagernet/sing-box/constant"
 	E "github.com/sagernet/sing/common/exceptions"
 	M "github.com/sagernet/sing/common/metadata"
+
+	C "github.com/sagernet/sing-box/constant"
+
+	"github.com/goccy/go-json"
 )
 
 type _Outbound struct {

+ 4 - 2
option/route.go

@@ -1,10 +1,12 @@
 package option
 
 import (
-	"github.com/goccy/go-json"
-	C "github.com/sagernet/sing-box/constant"
 	"github.com/sagernet/sing/common"
 	E "github.com/sagernet/sing/common/exceptions"
+
+	C "github.com/sagernet/sing-box/constant"
+
+	"github.com/goccy/go-json"
 )
 
 type RouteOptions struct {

+ 4 - 2
option/types.go

@@ -4,9 +4,11 @@ import (
 	"net/netip"
 	"strings"
 
-	"github.com/goccy/go-json"
-	C "github.com/sagernet/sing-box/constant"
 	E "github.com/sagernet/sing/common/exceptions"
+
+	C "github.com/sagernet/sing-box/constant"
+
+	"github.com/goccy/go-json"
 )
 
 type ListenAddress netip.Addr

+ 3 - 2
outbound/block.go

@@ -5,11 +5,12 @@ import (
 	"io"
 	"net"
 
+	M "github.com/sagernet/sing/common/metadata"
+	N "github.com/sagernet/sing/common/network"
+
 	"github.com/sagernet/sing-box/adapter"
 	C "github.com/sagernet/sing-box/constant"
 	"github.com/sagernet/sing-box/log"
-	M "github.com/sagernet/sing/common/metadata"
-	N "github.com/sagernet/sing/common/network"
 )
 
 var _ adapter.Outbound = (*Block)(nil)

+ 4 - 3
outbound/builder.go

@@ -1,13 +1,14 @@
 package outbound
 
 import (
+	"github.com/sagernet/sing/common"
+	E "github.com/sagernet/sing/common/exceptions"
+	F "github.com/sagernet/sing/common/format"
+
 	"github.com/sagernet/sing-box/adapter"
 	C "github.com/sagernet/sing-box/constant"
 	"github.com/sagernet/sing-box/log"
 	"github.com/sagernet/sing-box/option"
-	"github.com/sagernet/sing/common"
-	E "github.com/sagernet/sing/common/exceptions"
-	F "github.com/sagernet/sing/common/format"
 )
 
 func New(router adapter.Router, logger log.Logger, index int, options option.Outbound) (adapter.Outbound, error) {

+ 2 - 1
outbound/default.go

@@ -6,11 +6,12 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/sagernet/sing-box/log"
 	"github.com/sagernet/sing/common"
 	"github.com/sagernet/sing/common/buf"
 	"github.com/sagernet/sing/common/bufio"
 	E "github.com/sagernet/sing/common/exceptions"
+
+	"github.com/sagernet/sing-box/log"
 )
 
 type myOutboundAdapter struct {

+ 5 - 3
outbound/dialer/default.go

@@ -5,12 +5,14 @@ import (
 	"net"
 	"time"
 
-	"github.com/database64128/tfo-go"
-	C "github.com/sagernet/sing-box/constant"
-	"github.com/sagernet/sing-box/option"
 	"github.com/sagernet/sing/common/control"
 	M "github.com/sagernet/sing/common/metadata"
 	N "github.com/sagernet/sing/common/network"
+
+	C "github.com/sagernet/sing-box/constant"
+	"github.com/sagernet/sing-box/option"
+
+	"github.com/database64128/tfo-go"
 )
 
 type defaultDialer struct {

+ 3 - 2
outbound/dialer/detour.go

@@ -5,11 +5,12 @@ import (
 	"net"
 	"sync"
 
-	"github.com/sagernet/sing-box/adapter"
-	"github.com/sagernet/sing-box/option"
 	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-box/adapter"
+	"github.com/sagernet/sing-box/option"
 )
 
 type detourDialer struct {

+ 3 - 2
outbound/dialer/dialer.go

@@ -1,10 +1,11 @@
 package dialer
 
 import (
-	"github.com/sagernet/sing-box/adapter"
-	"github.com/sagernet/sing-box/option"
 	"github.com/sagernet/sing/common"
 	N "github.com/sagernet/sing/common/network"
+
+	"github.com/sagernet/sing-box/adapter"
+	"github.com/sagernet/sing-box/option"
 )
 
 func New(router adapter.Router, options option.DialerOptions) N.Dialer {

+ 3 - 2
outbound/dialer/override.go

@@ -5,11 +5,12 @@ import (
 	"crypto/tls"
 	"net"
 
-	C "github.com/sagernet/sing-box/constant"
-	"github.com/sagernet/sing-box/option"
 	M "github.com/sagernet/sing/common/metadata"
 	N "github.com/sagernet/sing/common/network"
 	"github.com/sagernet/sing/common/uot"
+
+	C "github.com/sagernet/sing-box/constant"
+	"github.com/sagernet/sing-box/option"
 )
 
 var _ N.Dialer = (*overrideDialer)(nil)

+ 4 - 3
outbound/direct.go

@@ -4,14 +4,15 @@ import (
 	"context"
 	"net"
 
+	"github.com/sagernet/sing/common/bufio"
+	M "github.com/sagernet/sing/common/metadata"
+	N "github.com/sagernet/sing/common/network"
+
 	"github.com/sagernet/sing-box/adapter"
 	C "github.com/sagernet/sing-box/constant"
 	"github.com/sagernet/sing-box/log"
 	"github.com/sagernet/sing-box/option"
 	"github.com/sagernet/sing-box/outbound/dialer"
-	"github.com/sagernet/sing/common/bufio"
-	M "github.com/sagernet/sing/common/metadata"
-	N "github.com/sagernet/sing/common/network"
 )
 
 var _ adapter.Outbound = (*Direct)(nil)

+ 5 - 4
outbound/http.go

@@ -5,15 +5,16 @@ import (
 	"net"
 	"os"
 
+	"github.com/sagernet/sing/common/bufio"
+	M "github.com/sagernet/sing/common/metadata"
+	N "github.com/sagernet/sing/common/network"
+	"github.com/sagernet/sing/protocol/http"
+
 	"github.com/sagernet/sing-box/adapter"
 	C "github.com/sagernet/sing-box/constant"
 	"github.com/sagernet/sing-box/log"
 	"github.com/sagernet/sing-box/option"
 	"github.com/sagernet/sing-box/outbound/dialer"
-	"github.com/sagernet/sing/common/bufio"
-	M "github.com/sagernet/sing/common/metadata"
-	N "github.com/sagernet/sing/common/network"
-	"github.com/sagernet/sing/protocol/http"
 )
 
 var _ adapter.Outbound = (*HTTP)(nil)

+ 8 - 6
outbound/shadowsocks.go

@@ -4,17 +4,19 @@ import (
 	"context"
 	"net"
 
+	"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-shadowsocks"
+	"github.com/sagernet/sing-shadowsocks/shadowimpl"
+
 	"github.com/sagernet/sing-box/adapter"
 	C "github.com/sagernet/sing-box/constant"
 	"github.com/sagernet/sing-box/log"
 	"github.com/sagernet/sing-box/option"
 	"github.com/sagernet/sing-box/outbound/dialer"
-	"github.com/sagernet/sing-shadowsocks"
-	"github.com/sagernet/sing-shadowsocks/shadowimpl"
-	"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"
 )
 
 var _ adapter.Outbound = (*Shadowsocks)(nil)

+ 5 - 4
outbound/socks.go

@@ -4,15 +4,16 @@ import (
 	"context"
 	"net"
 
+	"github.com/sagernet/sing/common/bufio"
+	M "github.com/sagernet/sing/common/metadata"
+	N "github.com/sagernet/sing/common/network"
+	"github.com/sagernet/sing/protocol/socks"
+
 	"github.com/sagernet/sing-box/adapter"
 	C "github.com/sagernet/sing-box/constant"
 	"github.com/sagernet/sing-box/log"
 	"github.com/sagernet/sing-box/option"
 	"github.com/sagernet/sing-box/outbound/dialer"
-	"github.com/sagernet/sing/common/bufio"
-	M "github.com/sagernet/sing/common/metadata"
-	N "github.com/sagernet/sing/common/network"
-	"github.com/sagernet/sing/protocol/socks"
 )
 
 var _ adapter.Outbound = (*Socks)(nil)

+ 8 - 7
route/router.go

@@ -9,13 +9,6 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/sagernet/sing-box/adapter"
-	"github.com/sagernet/sing-box/common/geoip"
-	"github.com/sagernet/sing-box/common/geosite"
-	"github.com/sagernet/sing-box/common/sniff"
-	C "github.com/sagernet/sing-box/constant"
-	"github.com/sagernet/sing-box/log"
-	"github.com/sagernet/sing-box/option"
 	"github.com/sagernet/sing/common"
 	"github.com/sagernet/sing/common/buf"
 	"github.com/sagernet/sing/common/bufio"
@@ -24,6 +17,14 @@ import (
 	M "github.com/sagernet/sing/common/metadata"
 	N "github.com/sagernet/sing/common/network"
 	"github.com/sagernet/sing/common/rw"
+
+	"github.com/sagernet/sing-box/adapter"
+	"github.com/sagernet/sing-box/common/geoip"
+	"github.com/sagernet/sing-box/common/geosite"
+	"github.com/sagernet/sing-box/common/sniff"
+	C "github.com/sagernet/sing-box/constant"
+	"github.com/sagernet/sing-box/log"
+	"github.com/sagernet/sing-box/option"
 )
 
 var _ adapter.Router = (*Router)(nil)

+ 4 - 3
route/rule.go

@@ -3,13 +3,14 @@ package route
 import (
 	"strings"
 
+	"github.com/sagernet/sing/common"
+	E "github.com/sagernet/sing/common/exceptions"
+	F "github.com/sagernet/sing/common/format"
+
 	"github.com/sagernet/sing-box/adapter"
 	C "github.com/sagernet/sing-box/constant"
 	"github.com/sagernet/sing-box/log"
 	"github.com/sagernet/sing-box/option"
-	"github.com/sagernet/sing/common"
-	E "github.com/sagernet/sing/common/exceptions"
-	F "github.com/sagernet/sing/common/format"
 )
 
 func NewRule(router adapter.Router, logger log.Logger, options option.Rule) (adapter.Rule, error) {

+ 2 - 1
route/rule_cidr.go

@@ -4,10 +4,11 @@ import (
 	"net/netip"
 	"strings"
 
-	"github.com/sagernet/sing-box/adapter"
 	"github.com/sagernet/sing/common"
 	E "github.com/sagernet/sing/common/exceptions"
 	F "github.com/sagernet/sing/common/format"
+
+	"github.com/sagernet/sing-box/adapter"
 )
 
 var _ RuleItem = (*IPCIDRItem)(nil)

+ 2 - 1
route/rule_domain.go

@@ -3,9 +3,10 @@ package route
 import (
 	"strings"
 
+	"github.com/sagernet/sing/common"
+
 	"github.com/sagernet/sing-box/adapter"
 	"github.com/sagernet/sing-box/common/domain"
-	"github.com/sagernet/sing/common"
 )
 
 var _ RuleItem = (*DomainItem)(nil)

+ 2 - 1
route/rule_domain_regex.go

@@ -4,9 +4,10 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/sagernet/sing-box/adapter"
 	E "github.com/sagernet/sing/common/exceptions"
 	F "github.com/sagernet/sing/common/format"
+
+	"github.com/sagernet/sing-box/adapter"
 )
 
 var _ RuleItem = (*DomainRegexItem)(nil)

+ 2 - 1
route/rule_geoip.go

@@ -3,9 +3,10 @@ package route
 import (
 	"strings"
 
+	N "github.com/sagernet/sing/common/network"
+
 	"github.com/sagernet/sing-box/adapter"
 	"github.com/sagernet/sing-box/log"
-	N "github.com/sagernet/sing/common/network"
 )
 
 var _ RuleItem = (*GeoIPItem)(nil)

+ 2 - 1
route/rule_geosite.go

@@ -3,11 +3,12 @@ package route
 import (
 	"strings"
 
+	E "github.com/sagernet/sing/common/exceptions"
+
 	"github.com/sagernet/sing-box/adapter"
 	"github.com/sagernet/sing-box/common/geosite"
 	"github.com/sagernet/sing-box/log"
 	"github.com/sagernet/sing-box/option"
-	E "github.com/sagernet/sing/common/exceptions"
 )
 
 var _ RuleItem = (*GeositeItem)(nil)

+ 2 - 1
route/rule_inbound.go

@@ -3,8 +3,9 @@ package route
 import (
 	"strings"
 
-	"github.com/sagernet/sing-box/adapter"
 	F "github.com/sagernet/sing/common/format"
+
+	"github.com/sagernet/sing-box/adapter"
 )
 
 var _ RuleItem = (*InboundItem)(nil)

+ 4 - 3
route/rule_logical.go

@@ -3,13 +3,14 @@ package route
 import (
 	"strings"
 
+	"github.com/sagernet/sing/common"
+	E "github.com/sagernet/sing/common/exceptions"
+	F "github.com/sagernet/sing/common/format"
+
 	"github.com/sagernet/sing-box/adapter"
 	C "github.com/sagernet/sing-box/constant"
 	"github.com/sagernet/sing-box/log"
 	"github.com/sagernet/sing-box/option"
-	"github.com/sagernet/sing/common"
-	E "github.com/sagernet/sing/common/exceptions"
-	F "github.com/sagernet/sing/common/format"
 )
 
 var _ adapter.Rule = (*LogicalRule)(nil)

+ 2 - 1
route/rule_port.go

@@ -3,9 +3,10 @@ package route
 import (
 	"strings"
 
-	"github.com/sagernet/sing-box/adapter"
 	"github.com/sagernet/sing/common"
 	F "github.com/sagernet/sing/common/format"
+
+	"github.com/sagernet/sing-box/adapter"
 )
 
 var _ RuleItem = (*PortItem)(nil)

+ 2 - 1
route/rule_protocol.go

@@ -3,8 +3,9 @@ package route
 import (
 	"strings"
 
-	"github.com/sagernet/sing-box/adapter"
 	F "github.com/sagernet/sing/common/format"
+
+	"github.com/sagernet/sing-box/adapter"
 )
 
 var _ RuleItem = (*ProtocolItem)(nil)

+ 4 - 3
service.go

@@ -4,15 +4,16 @@ import (
 	"context"
 	"time"
 
+	"github.com/sagernet/sing/common"
+	E "github.com/sagernet/sing/common/exceptions"
+	F "github.com/sagernet/sing/common/format"
+
 	"github.com/sagernet/sing-box/adapter"
 	"github.com/sagernet/sing-box/inbound"
 	"github.com/sagernet/sing-box/log"
 	"github.com/sagernet/sing-box/option"
 	"github.com/sagernet/sing-box/outbound"
 	"github.com/sagernet/sing-box/route"
-	"github.com/sagernet/sing/common"
-	E "github.com/sagernet/sing/common/exceptions"
-	F "github.com/sagernet/sing/common/format"
 )
 
 var _ adapter.Service = (*Service)(nil)