From bbaac2de6f409561feaf522505653dd765f51666 Mon Sep 17 00:00:00 2001 From: xream Date: Wed, 17 Jan 2024 21:24:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20Loon=20=E4=BC=A0=E8=BE=93=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/package.json | 2 +- backend/src/core/proxy-utils/producers/loon.js | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/backend/package.json b/backend/package.json index ec624cd..f193f65 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "sub-store", - "version": "2.14.175", + "version": "2.14.176", "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.", "main": "src/main.js", "scripts": { diff --git a/backend/src/core/proxy-utils/producers/loon.js b/backend/src/core/proxy-utils/producers/loon.js index 2d644fb..116c4fb 100644 --- a/backend/src/core/proxy-utils/producers/loon.js +++ b/backend/src/core/proxy-utils/producers/loon.js @@ -93,7 +93,9 @@ function trojan(proxy) { result.append( `${proxy.name}=trojan,${proxy.server},${proxy.port},"${proxy.password}"`, ); - + if (proxy.network === 'tcp') { + delete proxy.network; + } // transport if (isPresent(proxy, 'network')) { if (proxy.network === 'ws') { @@ -118,7 +120,7 @@ function trojan(proxy) { `,host=${Array.isArray(httpHost) ? httpHost[0] : httpHost}`, 'http-opts.headers.Host', ); - } else if (!['tcp'].includes(proxy.network)) { + } else { throw new Error(`network ${proxy.network} is unsupported`); } } @@ -146,7 +148,9 @@ function vmess(proxy) { result.append( `${proxy.name}=vmess,${proxy.server},${proxy.port},${proxy.cipher},"${proxy.uuid}"`, ); - + if (proxy.network === 'tcp') { + delete proxy.network; + } // transport if (isPresent(proxy, 'network')) { if (proxy.network === 'ws') { @@ -171,7 +175,7 @@ function vmess(proxy) { `,host=${Array.isArray(httpHost) ? httpHost[0] : httpHost}`, 'http-opts.headers.Host', ); - } else if (!['tcp'].includes(proxy.network)) { + } else { throw new Error(`network ${proxy.network} is unsupported`); } } else { @@ -213,7 +217,9 @@ function vless(proxy) { result.append( `${proxy.name}=vless,${proxy.server},${proxy.port},"${proxy.uuid}"`, ); - + if (proxy.network === 'tcp') { + delete proxy.network; + } // transport if (isPresent(proxy, 'network')) { if (proxy.network === 'ws') { @@ -238,7 +244,7 @@ function vless(proxy) { `,host=${Array.isArray(httpHost) ? httpHost[0] : httpHost}`, 'http-opts.headers.Host', ); - } else if (!['tcp'].includes(proxy.network)) { + } else { throw new Error(`network ${proxy.network} is unsupported`); } } else {