add amnezia for warp

Author: hiddify-com

ray2sing/awg.go

@@ -177,26 +177,26 @@ func AWGSingboxTxt(content string) (*T.Endpoint, error) {
 
 			PrivateKey: privateKey,
 			Address:    badoption.Listable[netip.Prefix](addresses),
-
-			Jc:   jc,
-			Jmin: jmin,
-			Jmax: jmax,
-
-			S1: s1,
-			S2: s2,
-			S3: s3,
-			S4: s4,
-			H1: h1,
-			H2: h2,
-			H3: h3,
-			H4: h4,
-
-			I1: i1,
-			I2: i2,
-			I3: i3,
-			I4: i4,
-			I5: i5,
-
+			Awg: T.AwgOptions{
+				Jc:   jc,
+				Jmin: jmin,
+				Jmax: jmax,
+
+				S1: s1,
+				S2: s2,
+				S3: s3,
+				S4: s4,
+				H1: h1,
+				H2: h2,
+				H3: h3,
+				H4: h4,
+
+				I1: i1,
+				I2: i2,
+				I3: i3,
+				I4: i4,
+				I5: i5,
+			},
 			Peers: []T.AwgPeerOptions{peer},
 		},
 	}
@@ -291,25 +291,26 @@ func AWGSingbox(raw string) (*T.Endpoint, error) {
 		PrivateKey: pk,
 		Address:    addresses,
 
-		Jc:   getInt("jc"),
-		Jmin: getInt("jmin"),
-		Jmax: getInt("jmax"),
-
-		S1: getInt("s1"),
-		S2: getInt("s2"),
-		S3: getInt("s3"),
-		S4: getInt("s4"),
-		H1: getOneOfN(u.Params, "", "h1"),
-		H2: getOneOfN(u.Params, "", "h2"),
-		H3: getOneOfN(u.Params, "", "h3"),
-		H4: getOneOfN(u.Params, "", "h4"),
-
-		I1: getOneOfN(u.Params, "", "i1"),
-		I2: getOneOfN(u.Params, "", "i2"),
-		I3: getOneOfN(u.Params, "", "i3"),
-		I4: getOneOfN(u.Params, "", "i4"),
-		I5: getOneOfN(u.Params, "", "i5"),
-
+		Awg: T.AwgOptions{
+			Jc:   getInt("jc"),
+			Jmin: getInt("jmin"),
+			Jmax: getInt("jmax"),
+
+			S1: getInt("s1"),
+			S2: getInt("s2"),
+			S3: getInt("s3"),
+			S4: getInt("s4"),
+			H1: getOneOfN(u.Params, "", "h1"),
+			H2: getOneOfN(u.Params, "", "h2"),
+			H3: getOneOfN(u.Params, "", "h3"),
+			H4: getOneOfN(u.Params, "", "h4"),
+
+			I1: getOneOfN(u.Params, "", "i1"),
+			I2: getOneOfN(u.Params, "", "i2"),
+			I3: getOneOfN(u.Params, "", "i3"),
+			I4: getOneOfN(u.Params, "", "i4"),
+			I5: getOneOfN(u.Params, "", "i5"),
+		},
 		Peers: []T.AwgPeerOptions{peer},
 	}
 	if mtuStr, ok := u.Params["mtu"]; ok {
@@ -318,7 +319,7 @@ func AWGSingbox(raw string) (*T.Endpoint, error) {
 		}
 	}
 	var out *T.Endpoint
-	isAwg := opts.Jc+opts.Jmin+opts.Jmax+opts.S1+opts.S2+opts.S3+opts.S4 == 0 && opts.H1+opts.H2+opts.H3+opts.H4+opts.I1+opts.I2+opts.I3+opts.I4 == ""
+	isAwg := opts.Awg.IsAvailble()
 
 	if true || isAwg {
 		wgopts := T.WireGuardEndpointOptions{

ray2sing/common.go

@@ -425,10 +425,10 @@ func getALPNversion(s []string) int {
 //		}
 //	}
 func getDialerOptions(decoded map[string]string) option.DialerOptions {
-	fragment := getFragmentOptions(decoded)
+	// fragment := getFragmentOptions(decoded)
 	return T.DialerOptions{
 		// TCPFastOpen: !fragment.Enabled,
-		TLSFragment: fragment,
+		// TLSFragment: fragment,
 	}
 }
 

ray2sing/warp.go

@@ -1,6 +1,8 @@
 package ray2sing
 
 import (
+	"strconv"
+
 	C "github.com/sagernet/sing-box/constant"
 	T "github.com/sagernet/sing-box/option"
 )
@@ -10,18 +12,46 @@ func WarpSingbox(url string) (*T.Endpoint, error) {
 	if err != nil {
 		return nil, err
 	}
+	getInt := func(key string) int {
+		if v, ok := u.Params[key]; ok {
+			i, _ := strconv.Atoi(v)
+			return i
+		}
+		return 0
+	}
 	// fmt.Println(u.Username, "-", u.Password, "-", u.Params)
 	out := T.Endpoint{
 		Type: C.TypeWARP,
 		Tag:  u.Name,
-		Options: &T.WireGuardWARPEndpointOptions{
+		Options: &T.WARPEndpointOptions{
 			ServerOptions: T.ServerOptions{
 				Server:     u.Hostname,
 				ServerPort: u.Port,
 			},
 			UniqueIdentifier: u.Username,
 			Noise:            getWireGuardNoise(u.Params, false),
 			MTU:              uint32(toInt(getOneOfN(u.Params, "1280", "mtu"))),
+
+			AWG: &T.AwgOptions{
+				Jc:   getInt("jc"),
+				Jmin: getInt("jmin"),
+				Jmax: getInt("jmax"),
+
+				S1: getInt("s1"),
+				S2: getInt("s2"),
+				S3: getInt("s3"),
+				S4: getInt("s4"),
+				H1: getOneOfN(u.Params, "", "h1"),
+				H2: getOneOfN(u.Params, "", "h2"),
+				H3: getOneOfN(u.Params, "", "h3"),
+				H4: getOneOfN(u.Params, "", "h4"),
+
+				I1: getOneOfN(u.Params, "", "i1"),
+				I2: getOneOfN(u.Params, "", "i2"),
+				I3: getOneOfN(u.Params, "", "i3"),
+				I4: getOneOfN(u.Params, "", "i4"),
+				I5: getOneOfN(u.Params, "", "i5"),
+			},
 		},
 	}
 

ray2sing/wireguard.go

@@ -129,7 +129,7 @@ func defaultWireguardNoiseOptions() hiddify.NoiseOptions {
 // 		return &T.Endpoint{
 // 			Type: C.TypeWARP,
 // 			Tag:  u.Name,
-// 			Options: &T.WireGuardWARPEndpointOptions{
+// 			Options: &T.WARPEndpointOptions{
 // 				ServerOptions: T.ServerOptions{
 // 					Server:     u.Hostname,
 // 					ServerPort: u.Port,

run.sh

@@ -1 +1 @@
-go run -tags with_utls,with_wiregaurd,with_awg $*
+go run -tags with_utls,with_wiregaurd,with_awg main.go $*