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

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

README.md

@@ -4,37 +4,37 @@ Sing-box with extended features.
 
 ## 🔥 Features
 
-### 🌐 Protocols
-- **WARP**
-- **Masque**
-- **MTProxy**
-- **Mieru**
-- **VPN**
-- **Bond**
-- **Fallback**
+### Protocols
+- WARP
+- MASQUE
+- MTProxy
+- Mieru
+- VPN
+- Bond
+- Fallback
 
-### 🚦 Limiters
-- **Bandwidth Limiter**
-- **Connection Limiter**
+### Limiters
+- Bandwidth Limiter
+- Connection Limiter
 
-### 🛡 Encryption & Obfuscation
-- **Amnezia 2.0**
-- **VLESS encryption**
+### Encryption & Obfuscation
+- Amnezia 2.0
+- VLESS encryption
 
-### 🔄 Transports
-- **mKCP**
-- **XHTTP**
+### Transports
+- mKCP
+- XHTTP
 
-### 🛠 Services
-- **Admin Panel**
-- **Manager**
-- **Node Manager**
+### Services
+- Admin Panel
+- Manager
+- Node Manager
 
-### ⚙ Miscellaneous
-- **Link parser**
-- **SDNS (DNSCrypt)**
-- **Extended WireGuard options** 
-- **Unified Delay**
+### Miscellaneous
+- Link parser
+- SDNS (DNSCrypt)
+- Extended WireGuard options
+- Unified Delay
 
 ## 📚 Examples
 
@@ -46,6 +46,14 @@ https://github.com/shtorm-7/sing-box-extended/tree/extended/examples
 
 If you want to support the project, you can donate to the following addresses.
 
+#### Tribute
+
+**[RUB Donate](https://web.tribute.tg/d/JxY)**
+
+**[EUR Donate](https://web.tribute.tg/d/JxZ)**
+
+**[USD Donate](https://web.tribute.tg/d/Jy1)**
+
 #### TRX (Tron)
 ```
 TSWU6VUZ4FcUghYDmbbhK15gRVvhvBgW3F
@@ -67,7 +75,7 @@ bc1qqx97p8k4dchqkyd47s4vf74hrqdfnmhqvcja7x
 0xAcc5919C22F2B3fAa0ec7E8BaD142da5B375FBF6
 ```
 
-## 📄 License
+## License
 
 ```
 Copyright (C) 2022 by nekohasekai <contact-sagernet@sekai.icu>

cmd/internal/build_libbox/main.go

@@ -63,7 +63,7 @@ func init() {
 	sharedFlags = append(sharedFlags, "-ldflags", "-X github.com/sagernet/sing-box/constant.Version="+currentTag+" -X internal/godebug.defaultGODEBUG=multipathtcp=0 -s -w -buildid=  -checklinkname=0")
 	debugFlags = append(debugFlags, "-ldflags", "-X github.com/sagernet/sing-box/constant.Version="+currentTag+" -X internal/godebug.defaultGODEBUG=multipathtcp=0 -checklinkname=0")
 
-	sharedTags = append(sharedTags, "with_gvisor", "with_quic", "with_wireguard", "with_utls", "with_naive_outbound", "with_clash_api", "badlinkname", "tfogo_checklinkname0")
+	sharedTags = append(sharedTags, "with_gvisor", "with_quic", "with_wireguard", "with_masque", "with_mtproxy", "with_utls", "with_naive_outbound", "with_clash_api", "badlinkname", "tfogo_checklinkname0")
 	darwinTags = append(darwinTags, "with_dhcp", "grpcnotrace")
 	// memcTags = append(memcTags, "with_tailscale")
 	sharedTags = append(sharedTags, "with_tailscale", "ts_omit_logtail", "ts_omit_ssh", "ts_omit_drive", "ts_omit_taildrop", "ts_omit_webclient", "ts_omit_doctor", "ts_omit_capture", "ts_omit_kube", "ts_omit_aws", "ts_omit_synology", "ts_omit_bird")

examples/vpn/proxy_client-server-vpn_client/server.json

@@ -21,18 +21,20 @@
           "key": "1c9b2ccf-b0c0-4c26-868d-a55a4edad3fe"
         }
       ],
-      "inbound": {
-        "type": "vless",
-        "tag": "vless-in",
-        "listen": "0.0.0.0",
-        "listen_port": 8000,
-        "users": [
-          {
-            "name": "vless",
-            "uuid": "9b65b7e1-04c8-4717-8f45-2aa61fd25937"
-          }
-        ]
-      }
+      "inbounds": [
+        {
+          "type": "vless",
+          "tag": "vless-in",
+          "listen": "0.0.0.0",
+          "listen_port": 8000,
+          "users": [
+            {
+              "name": "vless",
+              "uuid": "9b65b7e1-04c8-4717-8f45-2aa61fd25937"
+            }
+          ]
+        }
+      ]
     }
   ],
   "outbounds": [

examples/vpn/server-client/server.json

@@ -21,18 +21,20 @@
           "key": "1c9b2ccf-b0c0-4c26-868d-a55a4edad3fe"
         }
       ],
-      "inbound": {
-        "type": "vless",
-        "tag": "vless-in",
-        "listen": "0.0.0.0",
-        "listen_port": 8000,
-        "users": [
-          {
-            "name": "vless",
-            "uuid": "9b65b7e1-04c8-4717-8f45-2aa61fd25937"
-          }
-        ]
-      }
+      "inbounds": [
+        {
+          "type": "vless",
+          "tag": "vless-in",
+          "listen": "0.0.0.0",
+          "listen_port": 8000,
+          "users": [
+            {
+              "name": "vless",
+              "uuid": "9b65b7e1-04c8-4717-8f45-2aa61fd25937"
+            }
+          ]
+        }
+      ]
     }
   ],
   "inbounds": [

go.mod

@@ -13,7 +13,6 @@ require (
 	github.com/cretz/bine v0.2.0
 	github.com/database64128/tfo-go/v2 v2.3.2
 	github.com/enfein/mieru/v3 v3.17.1
-	github.com/go-chi/chi v1.5.5
 	github.com/go-chi/chi/v5 v5.2.5
 	github.com/go-chi/render v1.0.3
 	github.com/go-playground/validator/v10 v10.30.1
@@ -240,3 +239,5 @@ replace github.com/patrickmn/go-cache/v2 => github.com/shtorm-7/go-cache/v2 v2.1
 replace github.com/dolonet/mtg-multi => github.com/shtorm-7/mtg-multi v1.8.0-extended-1.0.0
 
 replace github.com/Diniboy1123/connect-ip-go => github.com/shtorm-7/connect-ip-go v1.0.0-extended-1.0.0
+
+replace github.com/GoAdminGroup/go-admin => github.com/shtorm-7/go-admin v1.2.26-extended-1.0.0

protocol/warp/endpoint.go

@@ -68,7 +68,7 @@ func NewEndpoint(ctx context.Context, router adapter.Router, logger log.ContextL
 			}
 		}
 		if config == nil {
-			config, err := endpoint.createConfig()
+			config, err = endpoint.createConfig()
 			if err != nil {
 				logger.ErrorContext(ctx, err)
 				return
@@ -183,6 +183,16 @@ func (w *Endpoint) isEndpointInitialized(ctx context.Context) error {
 }
 
 func (w *Endpoint) createConfig() (*Config, error) {
+	opts := make([]cloudflare.CloudflareApiOption, 0, 1)
+	if w.options.Profile.Detour != "" {
+		detour, ok := service.FromContext[adapter.OutboundManager](w.ctx).Outbound(w.options.Profile.Detour)
+		if !ok {
+			return nil, E.New("outbound detour not found: ", w.options.Profile.Detour)
+		}
+		opts = append(opts, cloudflare.WithDialContext(func(ctx context.Context, network, addr string) (net.Conn, error) {
+			return detour.DialContext(ctx, network, M.ParseSocksaddr(addr))
+		}))
+	}
 	var privateKey wgtypes.Key
 	var err error
 	if w.options.Profile.PrivateKey != "" {
@@ -196,16 +206,6 @@ func (w *Endpoint) createConfig() (*Config, error) {
 			return nil, err
 		}
 	}
-	opts := make([]cloudflare.CloudflareApiOption, 0, 1)
-	if w.options.Profile.Detour != "" {
-		detour, ok := service.FromContext[adapter.OutboundManager](w.ctx).Outbound(w.options.Profile.Detour)
-		if !ok {
-			return nil, E.New("outbound detour not found: ", w.options.Profile.Detour)
-		}
-		opts = append(opts, cloudflare.WithDialContext(func(ctx context.Context, network, addr string) (net.Conn, error) {
-			return detour.DialContext(ctx, network, M.ParseSocksaddr(addr))
-		}))
-	}
 	api := cloudflare.NewCloudflareApi(opts...)
 	var profile *cloudflare.CloudflareProfile
 	if w.options.Profile.AuthToken != "" && w.options.Profile.ID != "" {

protocol/wireguard/endpoint.go

@@ -45,7 +45,7 @@ type Endpoint struct {
 
 func NewEndpoint(ctx context.Context, router adapter.Router, logger log.ContextLogger, tag string, options option.WireGuardEndpointOptions) (adapter.Endpoint, error) {
 	ep := &Endpoint{
-		Adapter:        endpoint.NewAdapterWithDialerOptions(C.TypeWireGuard, tag, []string{N.NetworkTCP, N.NetworkUDP, N.NetworkICMP}, options.DialerOptions),
+		Adapter:        endpoint.NewAdapterWithDialerOptions(C.TypeWireGuard, tag, []string{N.NetworkTCP, N.NetworkUDP}, options.DialerOptions),
 		ctx:            ctx,
 		router:         router,
 		dnsRouter:      service.FromContext[adapter.DNSRouter](ctx),

route/route.go

@@ -485,7 +485,7 @@ match:
 					Fqdn: metadata.Destination.Fqdn,
 				}
 			}
-			if routeOptions.OverrideGateway.IsValid() {
+			if routeOptions.OverrideGateway != nil && routeOptions.OverrideGateway.IsValid() {
 				metadata.Gateway = routeOptions.OverrideGateway
 			}
 			if routeOptions.NetworkStrategy != nil {

service/admin_panel/service.go

@@ -8,7 +8,7 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/golang-migrate/migrate/v4"
 	_ "github.com/lib/pq"
 	"golang.org/x/net/http2"