Local-GitHub-Proxy/Sub-Store
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/sub-store-org/Sub-Store.git synced 2025-06-04 11:13:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复 SurgeMac ShadowsocksR obfs-param

Browse Source
This commit is contained in:
xream 2024-08-28 14:50:25 +08:00
parent 153802c7c4
commit 9abeb4ce7b
No known key found for this signature in database
GPG Key ID: 1D2C5225471789F9
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "sub-store", "name": "sub-store",
"version": "2.14.362", "version": "2.14.364",
"description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.", "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
"main": "src/main.js", "main": "src/main.js",
"scripts": { "scripts": {

2
backend/src/core/proxy-utils/parsers/index.js
View File

@ -158,7 +158,7 @@ function URI_SSR() {
for (const item of line) { for (const item of line) {
let [key, val] = item.split('='); let [key, val] = item.split('=');
val = val.trim(); val = val.trim();
if (val.length > 0) { if (val.length > 0 && val !== '(null)') {
other_params[key] = val; other_params[key] = val;
} }
} }

11
backend/src/core/proxy-utils/producers/surgemac.js
View File

@ -1,6 +1,6 @@
import { Result } from './utils'; import { Result, isPresent } from './utils';
import Surge_Producer from './surge'; import Surge_Producer from './surge';
import { isIPv4, isIPv6, isPresent } from '@/utils'; import { isIPv4, isIPv6 } from '@/utils';
import $ from '@/core/app'; import $ from '@/core/app';
const targetPlatform = 'SurgeMac'; const targetPlatform = 'SurgeMac';
@ -84,6 +84,7 @@ function shadowsocksr(proxy) {
for (const [key, value] of Object.entries({ for (const [key, value] of Object.entries({
cipher: '-m', cipher: '-m',
obfs: '-o', obfs: '-o',
'obfs-param': '-g',
password: '-k', password: '-k',
port: '-p', port: '-p',
protocol: '-O', protocol: '-O',
@ -92,8 +93,10 @@ function shadowsocksr(proxy) {
'local-port': '-l', 'local-port': '-l',
'local-address': '-b', 'local-address': '-b',
})) { })) {
external_proxy.args.push(value); if (external_proxy[key] != null) {
external_proxy.args.push(external_proxy[key]); external_proxy.args.push(value);
external_proxy.args.push(external_proxy[key]);
}
} }
return external(external_proxy); return external(external_proxy);