Merge pull request #51 from ionull/master

vless ws on loon
fix: compile error
2025-10-26 02:42:25 +00:00 · 2025-08-05 13:01:49 +08:00 · 2025-08-02 00:56:12 +08:00 · 2025-08-01 22:09:32 +08:00 · 2025-08-01 21:08:59 +08:00
1 changed files with 17 additions and 5 deletions
--- a/src/generator/config/subexport.cpp
+++ b/src/generator/config/subexport.cpp
@@ -2260,18 +2260,30 @@ proxyToLoon(std::vector<Proxy> &nodes, const std::string &base_conf,
                break;
            case ProxyType::VLESS:
                if (flow != "xtls-rprx-vision") {
-                    continue;
+                    if (transproto == "ws") {
+                        proxy = "VLESS," + hostname + "," + port + ",\"" + id + "\"" +
+                            ",path=" + path + ",host=" + host + ",transport=" + transproto +
+                            ",udp=" + (udp.get() ? "true" : "false") + ",over-tls=" + (
+                                tlssecure ? "true" : "false") + ",sni=" + sni;
+                    } else {
+                        continue;
+                    }
+                } else {
+                    proxy = "VLESS," + hostname + "," + port + ",\"" + id + "\",flow=" + flow + ",public-key=\"" + pk +
+                            "\",short-id=" + shortId + ",udp=" + (udp.get() ? "true" : "false") + ",over-tls=" + (
+                                tlssecure ? "true" : "false") + ",sni=" + sni;
                }
-                proxy = "VLESS," + hostname + "," + port + ",\"" + id + "\",flow=" + flow + ",public-key=\"" + pk +
-                        "\",short-id=" + shortId + ",udp=" + (udp.get() ? "true" : "false") + ",over-tls=" + (
-                            tlssecure ? "true" : "false") + ",sni=" + sni;

                switch (hash_(transproto)) {
                    case "tcp"_hash:
                        proxy += ",transport=tcp";
                        break;
                    default:
-                        continue;
+                        if (transproto != "ws") {
+                            continue;
+                        } else {
+                            break;;
+                        }
                }
                if (!scv.is_undef())
                    proxy += ",skip-cert-verify=" + std::string(scv.get() ? "true" : "false");
Author	SHA1	Message	Date
asdlokj1qpi23	57c18b0c69	Merge pull request #51 from ionull/master vless ws on loon	2025-08-05 13:01:49 +08:00
Tsung Wu	d95995a807	fix: compile error	2025-08-02 00:56:12 +08:00
Tsung Wu	add0e6da1a	fix: vless ws nodes export on loon	2025-08-01 22:09:32 +08:00
Tsung Wu	80363459f2	fix: some vless nodes not exported on loon	2025-08-01 21:08:59 +08:00