renun/Sub-Store
1
0
Fork 0
mirror of https://github.com/sub-store-org/Sub-Store.git synced 2025-08-10 00:52:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix (proxy-producer): ws-headers keys are lost when producing Surge nodes

Browse Source 
closes #119
This commit is contained in:
Peng-YM
2022-06-23 17:59:34 +08:00
parent f885d171a5
commit 28fa2b8fb7
4 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
backend/src/core/proxy-utils/producers/surge.js
View File

@@ -1,4 +1,5 @@
import { Result, isPresent } from './utils';
import { isNotBlank } from '@/utils';
import $ from '@/core/app';
const targetPlatform = 'Surge';
@@ -62,21 +63,8 @@ function trojan(proxy) {
result.append(`${proxy.name}=${proxy.type},${proxy.server},${proxy.port}`);
result.appendIfPresent(`,password=${proxy.password}`, 'password');
if (isPresent(proxy, 'network')) {
if (proxy.network === 'ws') {
result.append(`,ws=true`);
result.appendIfPresent(
`,ws-path=${proxy['ws-opts'].path}`,
'ws-opts.path',
);
result.appendIfPresent(
`,ws-headers=Host:${proxy['ws-opts'].headers.Host}`,
'ws-opts.headers.Host',
);
} else {
throw new Error(`network ${proxy.network} is not supported`);
}
}
// transport
handleTransport(result, proxy);
// tls
result.appendIfPresent(`,tls=${proxy.tls}`, 'tls');
@@ -107,21 +95,8 @@ function vmess(proxy) {
result.append(`${proxy.name}=${proxy.type},${proxy.server},${proxy.port}`);
result.appendIfPresent(`,username=${proxy.uuid}`, 'uuid');
if (isPresent(proxy, 'network')) {
if (proxy.network === 'ws') {
result.append(`,ws=true`);
result.appendIfPresent(
`,ws-path=${proxy['ws-opts'].path}`,
'ws-opts.path',
);
result.appendIfPresent(
`,ws-headers=Host:${proxy['ws-opts'].headers.Host}`,
'ws-opts.headers.Host',
);
} else {
throw new Error(`network ${proxy.network} is unsupported`);
}
}
// transport
handleTransport(result, proxy);
// AEAD
if (isPresent(proxy, 'aead')) {
@@ -237,3 +212,28 @@ function snell(proxy) {
result.appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
return result.toString();
}
function handleTransport(result, proxy) {
if (isPresent(proxy, 'network')) {
if (proxy.network === 'ws') {
result.append(`,ws=true`);
if (isPresent(proxy, 'ws-opts')) {
result.appendIfPresent(
`,ws-path=${proxy['ws-opts'].path}`,
'ws-opts.path',
);
if (isPresent(proxy, 'ws-opts.headers')) {
const headers = proxy['ws-opts'].headers;
const value = Object.keys(headers)
.map((k) => `${k}:${headers[k]}`)
.join('|');
if (isNotBlank(value)) {
result.append(`,ws-headers=${value}`);
}
}
}
} else {
throw new Error(`network ${proxy.network} is unsupported`);
}
}
}