From 80f44884fb218c4fca849e3c001efa357e3f9bf9 Mon Sep 17 00:00:00 2001 From: xream Date: Mon, 9 Jun 2025 12:37:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20SOCKS5=20=E8=A7=A3=E6=9E=90=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E5=AF=86=E7=A0=81=E9=A6=96=E5=B0=BE=E5=8F=8C=E5=BC=95?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 0 backend/package.json | 2 +- .../core/proxy-utils/parsers/peggy/surge.js | 2 +- .../core/proxy-utils/parsers/peggy/surge.peg | 2 +- nginx/front.conf | 40 ------------------- 5 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 .gitmodules delete mode 100644 nginx/front.conf diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e69de29..0000000 diff --git a/backend/package.json b/backend/package.json index 64f8c77..aa2ce38 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "sub-store", - "version": "2.19.61", + "version": "2.19.62", "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket.", "main": "src/main.js", "scripts": { diff --git a/backend/src/core/proxy-utils/parsers/peggy/surge.js b/backend/src/core/proxy-utils/parsers/peggy/surge.js index 050b16a..594b351 100644 --- a/backend/src/core/proxy-utils/parsers/peggy/surge.js +++ b/backend/src/core/proxy-utils/parsers/peggy/surge.js @@ -180,7 +180,7 @@ username = & { return true; } } { proxy.username = $.username; } -password = comma match:[^,]+ { proxy.password = match.join(""); } +password = comma match:[^,]+ { proxy.password = match.join("").replace(/^"(.*)"$/, '$1'); } tls = comma "tls" equals flag:bool { proxy.tls = flag; } sni = comma "sni" equals sni:("off"/domain) { diff --git a/backend/src/core/proxy-utils/parsers/peggy/surge.peg b/backend/src/core/proxy-utils/parsers/peggy/surge.peg index 01e0b8a..1a0e53c 100644 --- a/backend/src/core/proxy-utils/parsers/peggy/surge.peg +++ b/backend/src/core/proxy-utils/parsers/peggy/surge.peg @@ -177,7 +177,7 @@ username = & { return true; } } { proxy.username = $.username; } -password = comma match:[^,]+ { proxy.password = match.join(""); } +password = comma match:[^,]+ { proxy.password = match.join("").replace(/^"(.*)"$/, '$1'); } tls = comma "tls" equals flag:bool { proxy.tls = flag; } sni = comma "sni" equals sni:("off"/domain) { diff --git a/nginx/front.conf b/nginx/front.conf deleted file mode 100644 index 7f37b53..0000000 --- a/nginx/front.conf +++ /dev/null @@ -1,40 +0,0 @@ -upstream api { - server 0.0.0.0:3000; -} - -server { - listen 6080; -# allow 127.0.0.1; -# allow 0.0.0.0; -# deny all; - - gzip on; - gzip_static on; - gzip_types text/plain application/json application/javascript application/x-javascript text/css application/xml text/javascript; - gzip_proxied any; - gzip_vary on; - gzip_comp_level 6; - gzip_buffers 16 8k; - gzip_http_version 1.0; - - location / { - root /Sub-Store/web/dist; - index index.html index.htm; - try_files $uri $uri/ /index.html; - } - - location /api { - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://api; - } - - location /download { - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://api; - } - -} \ No newline at end of file