mirror of
https://git.mirrors.martin98.com/https://github.com/sub-store-org/Sub-Store.git
synced 2026-03-21 04:02:35 +08:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8049134bb5 | ||
|
|
3f620700a4 | ||
|
|
9e64a68481 |
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "sub-store",
|
||||
"version": "2.14.323",
|
||||
"version": "2.14.326",
|
||||
"description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
|
||||
"main": "src/main.js",
|
||||
"scripts": {
|
||||
|
||||
@@ -340,6 +340,8 @@ function URI_VMess() {
|
||||
transportPath = Array.isArray(transportPath)
|
||||
? transportPath[0]
|
||||
: transportPath;
|
||||
} else {
|
||||
transportPath = '/';
|
||||
}
|
||||
}
|
||||
if (transportPath || transportHost) {
|
||||
|
||||
@@ -21,7 +21,7 @@ export default function Surge_Producer() {
|
||||
case 'trojan':
|
||||
return trojan(proxy);
|
||||
case 'vmess':
|
||||
return vmess(proxy);
|
||||
return vmess(proxy, opts['include-unsupported-proxy']);
|
||||
case 'http':
|
||||
return http(proxy);
|
||||
case 'socks5':
|
||||
@@ -264,7 +264,7 @@ function trojan(proxy) {
|
||||
return result.toString();
|
||||
}
|
||||
|
||||
function vmess(proxy) {
|
||||
function vmess(proxy, includeUnsupportedProxy) {
|
||||
const result = new Result(proxy);
|
||||
result.append(`${proxy.name}=${proxy.type},${proxy.server},${proxy.port}`);
|
||||
result.appendIfPresent(`,username=${proxy.uuid}`, 'uuid');
|
||||
@@ -278,7 +278,7 @@ function vmess(proxy) {
|
||||
);
|
||||
|
||||
// transport
|
||||
handleTransport(result, proxy);
|
||||
handleTransport(result, proxy, includeUnsupportedProxy);
|
||||
|
||||
// AEAD
|
||||
if (isPresent(proxy, 'aead')) {
|
||||
@@ -1013,7 +1013,7 @@ function hysteria2(proxy) {
|
||||
return result.toString();
|
||||
}
|
||||
|
||||
function handleTransport(result, proxy) {
|
||||
function handleTransport(result, proxy, includeUnsupportedProxy) {
|
||||
if (isPresent(proxy, 'network')) {
|
||||
if (proxy.network === 'ws') {
|
||||
result.append(`,ws=true`);
|
||||
@@ -1039,7 +1039,13 @@ function handleTransport(result, proxy) {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
throw new Error(`network ${proxy.network} is unsupported`);
|
||||
if (includeUnsupportedProxy && ['http'].includes(proxy.network)) {
|
||||
$.info(
|
||||
`Include Unsupported Proxy: nework ${proxy.network} -> tcp`,
|
||||
);
|
||||
} else {
|
||||
throw new Error(`network ${proxy.network} is unsupported`);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
6
backend/src/vendor/open-api.js
vendored
6
backend/src/vendor/open-api.js
vendored
@@ -382,6 +382,12 @@ export function HTTP(defaultOptions = { baseURL: '' }) {
|
||||
url: options.url,
|
||||
headers: options.headers,
|
||||
body: options.body,
|
||||
options: {
|
||||
Proxy: options.proxy,
|
||||
Timeout: options.timeout
|
||||
? options.timeout / 1000
|
||||
: 15,
|
||||
},
|
||||
});
|
||||
resolve({
|
||||
statusCode: response.status,
|
||||
|
||||
Reference in New Issue
Block a user