Fix SNI host missing in Surge configurations

src/speedtestutil.cpp

@@ -1374,7 +1374,7 @@ bool explodeSurge(std::string surge, const std::string &custom_port, int local_p
             if(host.empty() && !isIPv4(server) && !isIPv6(server))
                 host = server;
 
-            node.proxyStr = trojanConstruct(remarks, server, port, password, host, false);
+            node.proxyStr = trojanConstruct(remarks, server, port, password, host, true);
             break;
         default:
             switch(hash_(remarks))

src/subexport.cpp

@@ -1181,7 +1181,10 @@ std::string netchToSurge(std::vector<nodeInfo> &nodes, std::string &base_conf, s
         case SPEEDTEST_MESSAGE_FOUNDTROJAN:
             if(surge_ver < 4)
                 continue;
+            host = GetMember(json, "Host");
             proxy = "trojan, " + hostname + ", " + port + ", password=" + password;
+            if(host.size())
+                proxy += ", sni=" + host;
             if(ext.skip_cert_verify)
                 proxy += ", skip-cert-verify=1";
             break;