feat(client): add additional options for Shadowsocks and Vless protocols

adapter/client.go

@@ -36,8 +36,7 @@ type Proxy struct {
 	// Shadowsocks Options
 	Method    string
 	ServerKey string // For Shadowsocks 2022
-	Plugin        string // Plugin for Shadowsocks
+
-	PluginOptions string // Plugin options for Shadowsocks
 	// Vmess/Vless/Trojan Options
 	Flow string // Flow for Vmess/Vless/Trojan
 	// Hysteria2 Options
@@ -58,6 +57,25 @@ type Proxy struct {
 
 	// Mieru
 	Multiplex string
+
+	// Obfs
+	Obfs     string // obfs, 'none', 'http', 'tls'
+	ObfsHost string // obfs host
+	ObfsPath string // obfs path
+
+	// Vless
+	XhttpMode  string // xhttp mode
+	XhttpExtra string // xhttp path
+
+	// encryption
+	Encryption              string // encryption，'none', 'mlkem768x25519plus'
+	EncryptionMode          string // encryption mode，'native', 'xorpub', 'random'
+	EncryptionRtt           string // encryption rtt，'0rtt', '1rtt'
+	EncryptionTicket        string // encryption ticket
+	EncryptionServerPadding string // encryption server padding
+	EncryptionPrivateKey    string // encryption private key
+	EncryptionClientPadding string // encryption client padding
+	EncryptionPassword      string // encryption password
 }
 
 type User struct {

apis/types.api

@@ -772,6 +772,7 @@ type (
 	Protocol {
 		Type                    string `json:"type"`
 		Port                    uint16 `json:"port"`
+        Enable                  bool   `json:"enable"`
 		Security                string `json:"security,omitempty"`
 		SNI                     string `json:"sni,omitempty"`
 		AllowInsecure           bool   `json:"allow_insecure,omitempty"`
@@ -795,12 +796,23 @@ type (
 		ReduceRtt               bool   `json:"reduce_rtt,omitempty"`
 		UDPRelayMode            string `json:"udp_relay_mode,omitempty"`
 		CongestionController    string `json:"congestion_controller,omitempty"`
-		Plugin               string `json:"plugin,omitempty"` // obfs, none,v2ray-plugin, simple-obfs
-		PluginOptions        string `json:"plugin_options,omitempty"` // plugin options, eg: obfs=http;obfs-host=www.bing.com
 		Multiplex               string `json:"multiplex,omitempty"` // mux, eg: off/low/medium/high
 		PaddingScheme           string `json:"padding_scheme,omitempty"` // padding scheme
 		UpMbps                  int    `json:"up_mbps,omitempty"` // upload speed limit
 		DownMbps                int    `json:"down_mbps,omitempty"` // download speed limit
+		Obfs                    string `json:"obfs,omitempty"` // obfs, 'none', 'http', 'tls'
+		ObfsHost                string `json:"obfs_host,omitempty"` // obfs host
+		ObfsPath                string `json:"obfs_path,omitempty"` // obfs path
+		XhttpMode               string `json:"xhttp_mode,omitempty"` // xhttp mode
+		XhttpExtra              string `json:"xhttp_extra,omitempty"` // xhttp extra path
+		Encryption              string `json:"encryption,omitempty"` // encryption，'none', 'mlkem768x25519plus'
+		EncryptionMode          string `json:"encryption_mode,omitempty"` // encryption mode，'native', 'xorpub', 'random'
+		EncryptionRtt           string `json:"encryption_rtt,omitempty"` // encryption rtt，'0rtt', '1rtt'
+		EncryptionTicket        string `json:"encryption_ticket,omitempty"` // encryption ticket
+		EncryptionServerPadding string `json:"encryption_server_padding,omitempty"` // encryption server padding
+		EncryptionPrivateKey    string `json:"encryption_private_key,omitempty"` // encryption private key
+		EncryptionClientPadding string `json:"encryption_client_padding,omitempty"` // encryption client padding
+		EncryptionPassword      string `json:"encryption_password,omitempty"` // encryption password
 	}
 )
 

internal/model/node/server.go

@@ -103,6 +103,7 @@ func (m *Server) UnmarshalProtocols() ([]Protocol, error) {
 type Protocol struct {
 	Type                    string `json:"type"`
 	Port                    uint16 `json:"port"`
+	Enable                  bool   `json:"enable"`
 	Security                string `json:"security,omitempty"`
 	SNI                     string `json:"sni,omitempty"`
 	AllowInsecure           bool   `json:"allow_insecure,omitempty"`
@@ -126,12 +127,23 @@ type Protocol struct {
 	ReduceRtt               bool   `json:"reduce_rtt,omitempty"`
 	UDPRelayMode            string `json:"udp_relay_mode,omitempty"`
 	CongestionController    string `json:"congestion_controller,omitempty"`
-	Plugin               string `json:"plugin,omitempty"`         // obfs, v2ray-plugin, simple-obfs
-	PluginOptions        string `json:"plugin_options,omitempty"` // plugin options, eg: obfs=http;obfs-host=www.bing.com
 	Multiplex               string `json:"multiplex,omitempty"`                 // mux, eg: off/low/medium/high
 	PaddingScheme           string `json:"padding_scheme,omitempty"`            // padding scheme
 	UpMbps                  int    `json:"up_mbps,omitempty"`                   // upload speed limit
 	DownMbps                int    `json:"down_mbps,omitempty"`                 // download speed limit
+	Obfs                    string `json:"obfs,omitempty"`                      // obfs, 'none', 'http', 'tls'
+	ObfsHost                string `json:"obfs_host,omitempty"`                 // obfs host
+	ObfsPath                string `json:"obfs_path,omitempty"`                 // obfs path
+	XhttpMode               string `json:"xhttp_mode,omitempty"`                // xhttp mode
+	XhttpExtra              string `json:"xhttp_extra,omitempty"`               // xhttp extra path
+	Encryption              string `json:"encryption,omitempty"`                // encryption，'none', 'mlkem768x25519plus'
+	EncryptionMode          string `json:"encryption_mode,omitempty"`           // encryption mode，'native', 'xorpub', 'random'
+	EncryptionRtt           string `json:"encryption_rtt,omitempty"`            // encryption rtt，'0rtt', '1rtt'
+	EncryptionTicket        string `json:"encryption_ticket,omitempty"`         // encryption ticket
+	EncryptionServerPadding string `json:"encryption_server_padding,omitempty"` // encryption server padding
+	EncryptionPrivateKey    string `json:"encryption_private_key,omitempty"`    // encryption private key
+	EncryptionClientPadding string `json:"encryption_client_padding,omitempty"` // encryption client padding
+	EncryptionPassword      string `json:"encryption_password,omitempty"`       // encryption password
 }
 
 // Marshal protocol to json

internal/types/types.go

@@ -1448,12 +1448,23 @@ type Protocol struct {
 	ReduceRtt               bool   `json:"reduce_rtt,omitempty"`
 	UDPRelayMode            string `json:"udp_relay_mode,omitempty"`
 	CongestionController    string `json:"congestion_controller,omitempty"`
-	Plugin               string `json:"plugin,omitempty"`         // obfs, v2ray-plugin, simple-obfs
-	PluginOptions        string `json:"plugin_options,omitempty"` // plugin options, eg: obfs=http;obfs-host=www.bing.com
 	Multiplex               string `json:"multiplex,omitempty"`                 // mux, eg: off/low/medium/high
 	PaddingScheme           string `json:"padding_scheme,omitempty"`            // padding scheme
 	UpMbps                  int    `json:"up_mbps,omitempty"`                   // upload speed limit
 	DownMbps                int    `json:"down_mbps,omitempty"`                 // download speed limit
+	Obfs                    string `json:"obfs,omitempty"`                      // obfs, 'none', 'http', 'tls'
+	ObfsHost                string `json:"obfs_host,omitempty"`                 // obfs host
+	ObfsPath                string `json:"obfs_path,omitempty"`                 // obfs path
+	XhttpMode               string `json:"xhttp_mode,omitempty"`                // xhttp mode
+	XhttpExtra              string `json:"xhttp_extra,omitempty"`               // xhttp extra path
+	Encryption              string `json:"encryption,omitempty"`                // encryption，'none', 'mlkem768x25519plus'
+	EncryptionMode          string `json:"encryption_mode,omitempty"`           // encryption mode，'native', 'xorpub', 'random'
+	EncryptionRtt           string `json:"encryption_rtt,omitempty"`            // encryption rtt，'0rtt', '1rtt'
+	EncryptionTicket        string `json:"encryption_ticket,omitempty"`         // encryption ticket
+	EncryptionServerPadding string `json:"encryption_server_padding,omitempty"` // encryption server padding
+	EncryptionPrivateKey    string `json:"encryption_private_key,omitempty"`    // encryption private key
+	EncryptionClientPadding string `json:"encryption_client_padding,omitempty"` // encryption client padding
+	EncryptionPassword      string `json:"encryption_password,omitempty"`       // encryption password
 }
 
 type PubilcRegisterConfig struct {