Merge 02c9086d9d into 17966b5418

common/convert/converter.go

@@ -178,15 +178,23 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			}
 
 			switch network {
-			case "ws":
+			case "ws", "httpupgrade":
 				headers := make(map[string]any)
 				wsOpts := make(map[string]any)
 
 				headers["User-Agent"] = RandUserAgent()
+				if host := query.Get("host"); host != "" {
+					headers["Host"] = host
+				}
 
 				wsOpts["path"] = query.Get("path")
 				wsOpts["headers"] = headers
 
+				if network == "httpupgrade" {
+					wsOpts["v2ray-http-upgrade"] = true
+					wsOpts["v2ray-http-upgrade-fast-open"] = true
+				}
+
 				trojan["ws-opts"] = wsOpts
 
 			case "grpc":
@@ -358,6 +366,7 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 									wsOpts["max-early-data"] = med
 									wsOpts["early-data-header-name"] = "Sec-WebSocket-Protocol"
 								case "httpupgrade":
+									wsOpts["v2ray-http-upgrade"] = true
 									wsOpts["v2ray-http-upgrade-fast-open"] = true
 								}
 								query.Del("ed")
@@ -455,6 +464,8 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 						"host":               pluginInfo.Get("host"),
 						"path":               pluginInfo.Get("path"),
 						"tls":                strings.Contains(plugin, "tls"),
+						"mux":                pluginInfo.Get("mux") != "0",
+						"v2ray-http-upgrade": strings.Contains(plugin, "httpupgrade"),
 					}
 				}
 			}

common/convert/v.go

@@ -118,6 +118,7 @@ func handleVShareLink(names map[string]int, url *url.URL, scheme string, proxy m
 				wsOpts["max-early-data"] = med
 				wsOpts["early-data-header-name"] = "Sec-WebSocket-Protocol"
 			case "httpupgrade":
+				wsOpts["v2ray-http-upgrade"] = true
 				wsOpts["v2ray-http-upgrade-fast-open"] = true
 			}
 		}