From fea39aff9eed01dbbb7508248540b9f49f7df8b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@sekai.icu>
Date: Tue, 18 Mar 2025 09:27:53 +0800
Subject: [PATCH] Remove map usage in options

---
 option/shadowtls.go           | 15 ++++++++-------
 protocol/shadowtls/inbound.go | 18 ++++++++++--------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/option/shadowtls.go b/option/shadowtls.go
index 7edbac40..81ef9a43 100644
--- a/option/shadowtls.go
+++ b/option/shadowtls.go
@@ -4,17 +4,18 @@ 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 map[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 *badjson.TypedMap[string, ShadowTLSHandshakeOptions] `json:"handshake_for_server_name,omitempty"`
+	StrictMode             bool                                                 `json:"strict_mode,omitempty"`
+	WildcardSNI            WildcardSNI                                          `json:"wildcard_sni,omitempty"`
 }
 
 type WildcardSNI int
diff --git a/protocol/shadowtls/inbound.go b/protocol/shadowtls/inbound.go
index 0508999b..812df1ef 100644
--- a/protocol/shadowtls/inbound.go
+++ b/protocol/shadowtls/inbound.go
@@ -46,14 +46,16 @@ 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)
-		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,
+		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,
+				}
 			}
 		}
 	}