feat: patch http-proxy; 使用 undici 替代 request

fix: 修复文件预览未使用代理策略的问题
feat: 升级 http-proxy-middleware
2025-08-10 00:52:40 +00:00 · 2025-03-13 13:02:19 +08:00 · 2025-03-12 19:44:54 +08:00 · 2025-03-12 15:30:14 +08:00 · 2025-03-10 23:06:33 +08:00 · 2025-03-10 19:52:15 +08:00
18 changed files with 286 additions and 338 deletions
--- a/README.md
+++ b/README.md
@@ -32,14 +32,14 @@ Core functionalities:

  example: `socks5+tls://user:pass@ip:port#name`

- [x] URI(SOCKS, SS, SSR, VMess, VLESS, Trojan, Hysteria, Hysteria 2, TUIC v5, WireGuard)
+- [x] URI(AnyTLS, SOCKS, SS, SSR, VMess, VLESS, Trojan, Hysteria, Hysteria 2, TUIC v5, WireGuard)
 - [x] Clash Proxies YAML
 - [x] Clash Proxy JSON(single line)
 - [x] QX (SS, SSR, VMess, Trojan, HTTP, SOCKS5, VLESS)
 - [x] Loon (SS, SSR, VMess, Trojan, HTTP, SOCKS5, SOCKS5-TLS, WireGuard, VLESS, Hysteria 2)
 - [x] Surge (Direct, SS, VMess, Trojan, HTTP, SOCKS5, SOCKS5-TLS, TUIC, Snell, Hysteria 2, SSH(Password authentication only), External Proxy Program(only for macOS), WireGuard(Surge to Surge))
 - [x] Surfboard (SS, VMess, Trojan, HTTP, SOCKS5, SOCKS5-TLS, WireGuard(Surfboard to Surfboard))
- [x] Clash.Meta (Direct, SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, Hysteria 2, TUIC, SSH, mieru)
+- [x] Clash.Meta (Direct, SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, Hysteria 2, TUIC, SSH, mieru, AnyTLS)
 - [x] Stash (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, TUIC, Juicity, SSH)
 - [x] Clash (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard)

--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
  "name": "sub-store",
-  "version": "2.17.2",
+  "version": "2.18.0",
  "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket.",
  "main": "src/main.js",
  "scripts": {
@@ -17,6 +17,11 @@
  },
  "author": "Peng-YM",
  "license": "GPL-3.0",
+  "pnpm": {
+    "patchedDependencies": {
+      "http-proxy@1.18.1": "patches/http-proxy@1.18.1.patch"
+    }
+  },
  "dependencies": {
    "@maxmind/geoip2-node": "^5.0.0",
    "automerge": "1.0.1-preview.7",
@@ -26,16 +31,16 @@
    "cron": "^3.1.6",
    "dns-packet": "^5.6.1",
    "express": "^4.17.1",
-    "http-proxy-middleware": "^2.0.6",
+    "http-proxy-middleware": "^3.0.3",
    "ip-address": "^9.0.5",
    "js-base64": "^3.7.2",
    "jsrsasign": "^11.1.0",
    "lodash": "^4.17.21",
    "ms": "^2.1.3",
    "nanoid": "^3.3.3",
-    "request": "^2.88.2",
    "semver": "^7.6.3",
-    "static-js-yaml": "^1.0.0"
+    "static-js-yaml": "^1.0.0",
+    "undici": "^7.4.0"
  },
  "devDependencies": {
    "@babel/core": "^7.18.0",
--- a/backend/patches/http-proxy@1.18.1.patch
+++ b/backend/patches/http-proxy@1.18.1.patch
@@ -0,0 +1,46 @@
+diff --git a/lib/http-proxy/common.js b/lib/http-proxy/common.js
+index 6513e81d80d5250ea249ea833f819ece67897c7e..486d4c896d65a3bb7cf63307af68facb3ddb886b 100644
+--- a/lib/http-proxy/common.js
+++ b/lib/http-proxy/common.js
+@@ -1,6 +1,5 @@
+ var common   = exports,
+     url      = require('url'),
+-    extend   = require('util')._extend,
+     required = require('requires-port');
+ 
+ var upgradeHeader = /(^|,)\s*upgrade\s*($|,)/i,
+@@ -40,10 +39,10 @@ common.setupOutgoing = function(outgoing, options, req, forward) {
+   );
+ 
+   outgoing.method = options.method || req.method;
+-  outgoing.headers = extend({}, req.headers);
+  outgoing.headers = Object.assign({}, req.headers);
+ 
+   if (options.headers){
+-    extend(outgoing.headers, options.headers);
+    Object.assign(outgoing.headers, options.headers);
+   }
+ 
+   if (options.auth) {
+diff --git a/lib/http-proxy/index.js b/lib/http-proxy/index.js
+index 977a4b3622b9eaac27689f06347ea4c5173a96cd..88b2d0fcfa03c3aafa47c7e6d38e64412c45a7cc 100644
+--- a/lib/http-proxy/index.js
+++ b/lib/http-proxy/index.js
+@@ -1,5 +1,4 @@
+ var httpProxy = module.exports,
+-    extend    = require('util')._extend,
+     parse_url = require('url').parse,
+     EE3       = require('eventemitter3'),
+     http      = require('http'),
+@@ -47,9 +46,9 @@ function createRightProxy(type) {
+         args[cntr] !== res
+       ) {
+         //Copy global options
+-        requestOptions = extend({}, options);
+        requestOptions = Object.assign({}, options);
+         //Overwrite with request options
+-        extend(requestOptions, args[cntr]);
+        Object.assign(requestOptions, args[cntr]);
+ 
+         cntr--;
+       }
--- a/backend/pnpm-lock.yaml
+++ b/backend/pnpm-lock.yaml
@@ -4,6 +4,11 @@ settings:
  autoInstallPeers: true
  excludeLinksFromLockfile: false

+patchedDependencies:
+  http-proxy@1.18.1:
+    hash: 8071c23044f455271f4d4074ae4c7b81beec17a03aefd158d5f4edd4ef751c11
+    path: patches/http-proxy@1.18.1.patch
+
 importers:

  .:
@@ -33,8 +38,8 @@ importers:
        specifier: ^4.17.1
        version: 4.21.2
      http-proxy-middleware:
-        specifier: ^2.0.6
-        version: 2.0.7
+        specifier: ^3.0.3
+        version: 3.0.3
      ip-address:
        specifier: ^9.0.5
        version: 9.0.5
@@ -53,15 +58,15 @@ importers:
      nanoid:
        specifier: ^3.3.3
        version: 3.3.8
-      request:
-        specifier: ^2.88.2
-        version: 2.88.2
      semver:
        specifier: ^7.6.3
        version: 7.6.3
      static-js-yaml:
        specifier: ^1.0.0
        version: 1.0.0
+      undici:
+        specifier: ^7.4.0
+        version: 7.4.0
    devDependencies:
      '@babel/core':
        specifier: ^7.18.0
@@ -1072,9 +1077,6 @@ packages:
  asn1.js@4.10.1:
    resolution: {integrity: sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==}

-  asn1@0.2.6:
-    resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==}
-
  assert-plus@1.0.0:
    resolution: {integrity: sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==}
    engines: {node: '>=0.8'}
@@ -1100,9 +1102,6 @@ packages:
    resolution: {integrity: sha512-VPXfB4Vk49z1LHHodrEQ6Xf7W4gg1w0dAPROHngx7qgDjqmIQ+fXmwgGXTW/ITLai0YLSvWepJOP9EVpMnEAcw==}
    engines: {node: '>= 0.10'}

-  asynckit@0.4.0:
-    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
-
  atob@2.1.2:
    resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
    engines: {node: '>= 4.5.0'}
@@ -1115,12 +1114,6 @@ packages:
    resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
    engines: {node: '>= 0.4'}

-  aws-sign2@0.7.0:
-    resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==}
-
-  aws4@1.13.2:
-    resolution: {integrity: sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==}
-
  axios@0.21.4:
    resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==}

@@ -1168,9 +1161,6 @@ packages:
    resolution: {integrity: sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==}
    engines: {node: '>=0.10.0'}

-  bcrypt-pbkdf@1.0.2:
-    resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==}
-
  binary-extensions@1.13.1:
    resolution: {integrity: sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==}
    engines: {node: '>=0.10.0'}
@@ -1327,9 +1317,6 @@ packages:
  caniuse-lite@1.0.30001692:
    resolution: {integrity: sha512-A95VKan0kdtrsnMubMKxEKUKImOPSuCpYgxSQBo036P5YYgVIcOYJEgt/txJWqObiRQeISNCfef9nvlQ0vbV7A==}

-  caseless@0.12.0:
-    resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
-
  chai@4.5.0:
    resolution: {integrity: sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==}
    engines: {node: '>=4'}
@@ -1410,10 +1397,6 @@ packages:
  combine-source-map@0.8.0:
    resolution: {integrity: sha512-UlxQ9Vw0b/Bt/KYwCFqdEwsQ1eL8d1gibiFb7lxQJFdvTgc2hIZi6ugsg+kyhzhPV+QEpUiEIwInIAIrgoEkrg==}

-  combined-stream@1.0.8:
-    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
-    engines: {node: '>= 0.8'}
-
  commander@2.20.3:
    resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}

@@ -1535,10 +1518,6 @@ packages:
  dash-ast@2.0.1:
    resolution: {integrity: sha512-5TXltWJGc+RdnabUGzhRae1TRq6m4gr+3K2wQX0is5/F2yS6MJXJvLyI3ErAnsAXuJoGqvfVD5icRgim07DrxQ==}

-  dashdash@1.14.1:
-    resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
-    engines: {node: '>=0.10'}
-
  data-view-buffer@1.0.2:
    resolution: {integrity: sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==}
    engines: {node: '>= 0.4'}
@@ -1633,10 +1612,6 @@ packages:
  defined@1.0.1:
    resolution: {integrity: sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==}

-  delayed-stream@1.0.0:
-    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
-    engines: {node: '>=0.4.0'}
-
  depd@2.0.0:
    resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
    engines: {node: '>= 0.8'}
@@ -1702,9 +1677,6 @@ packages:
  each-props@1.3.2:
    resolution: {integrity: sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==}

-  ecc-jsbn@0.1.2:
-    resolution: {integrity: sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==}
-
  ee-first@1.1.1:
    resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}

@@ -2074,16 +2046,9 @@ packages:
    resolution: {integrity: sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==}
    engines: {node: '>=0.10.0'}

-  forever-agent@0.6.1:
-    resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==}
-
  fork-stream@0.0.4:
    resolution: {integrity: sha512-Pqq5NnT78ehvUnAk/We/Jr22vSvanRlFTpAmQ88xBY/M1TlHe+P0ILuEyXS595ysdGfaj22634LBkGMA2GTcpA==}

-  form-data@2.3.3:
-    resolution: {integrity: sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==}
-    engines: {node: '>= 0.12'}
-
  forwarded@0.2.0:
    resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
    engines: {node: '>= 0.6'}
@@ -2167,9 +2132,6 @@ packages:
    resolution: {integrity: sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==}
    engines: {node: '>=0.10.0'}

-  getpass@0.1.7:
-    resolution: {integrity: sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==}
-
  glob-parent@3.1.0:
    resolution: {integrity: sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==}

@@ -2273,15 +2235,6 @@ packages:
    resolution: {integrity: sha512-hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw==}
    engines: {node: '>= 0.10'}

-  har-schema@2.0.0:
-    resolution: {integrity: sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==}
-    engines: {node: '>=4'}
-
-  har-validator@5.1.5:
-    resolution: {integrity: sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==}
-    engines: {node: '>=6'}
-    deprecated: this library is no longer supported
-
  has-ansi@2.0.0:
    resolution: {integrity: sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==}
    engines: {node: '>=0.10.0'}
@@ -2366,23 +2319,14 @@ packages:
    resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==}
    engines: {node: '>= 0.8'}

-  http-proxy-middleware@2.0.7:
-    resolution: {integrity: sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==}
-    engines: {node: '>=12.0.0'}
-    peerDependencies:
-      '@types/express': ^4.17.13
-    peerDependenciesMeta:
-      '@types/express':
-        optional: true
+  http-proxy-middleware@3.0.3:
+    resolution: {integrity: sha512-usY0HG5nyDUwtqpiZdETNbmKtw3QQ1jwYFZ9wi5iHzX2BcILwQKtYDJPo7XHTsu5Z0B2Hj3W9NNnbd+AjFWjqg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}

  http-proxy@1.18.1:
    resolution: {integrity: sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==}
    engines: {node: '>=8.0.0'}

-  http-signature@1.2.0:
-    resolution: {integrity: sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==}
-    engines: {node: '>=0.8', npm: '>=1.3.7'}
-
  https-browserify@1.0.0:
    resolution: {integrity: sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==}

@@ -2597,10 +2541,6 @@ packages:
    resolution: {integrity: sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==}
    engines: {node: '>=8'}

-  is-plain-obj@3.0.0:
-    resolution: {integrity: sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==}
-    engines: {node: '>=10'}
-
  is-plain-object@2.0.4:
    resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==}
    engines: {node: '>=0.10.0'}
@@ -2637,9 +2577,6 @@ packages:
    resolution: {integrity: sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==}
    engines: {node: '>= 0.4'}

-  is-typedarray@1.0.0:
-    resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==}
-
  is-unc-path@1.0.0:
    resolution: {integrity: sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==}
    engines: {node: '>=0.10.0'}
@@ -2691,9 +2628,6 @@ packages:
    resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==}
    engines: {node: '>=0.10.0'}

-  isstream@0.1.2:
-    resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==}
-
  js-base64@3.7.7:
    resolution: {integrity: sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw==}

@@ -2708,9 +2642,6 @@ packages:
    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
    hasBin: true

-  jsbn@0.1.1:
-    resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==}
-
  jsbn@1.1.0:
    resolution: {integrity: sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==}

@@ -2736,9 +2667,6 @@ packages:
  json-stable-stringify-without-jsonify@1.0.1:
    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}

-  json-stringify-safe@5.0.1:
-    resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
-
  json5@2.2.3:
    resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
    engines: {node: '>=6'}
@@ -2748,10 +2676,6 @@ packages:
    resolution: {integrity: sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==}
    engines: {'0': node >= 0.2.0}

-  jsprim@1.4.2:
-    resolution: {integrity: sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==}
-    engines: {node: '>=0.6.0'}
-
  jsprim@2.0.2:
    resolution: {integrity: sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==}
    engines: {'0': node >=0.6.0}
@@ -3065,9 +2989,6 @@ packages:
    resolution: {integrity: sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==}
    engines: {node: '>=0.10.0'}

-  oauth-sign@0.9.0:
-    resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==}
-
  object-assign@4.1.1:
    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
    engines: {node: '>=0.10.0'}
@@ -3272,9 +3193,6 @@ packages:
    engines: {node: '>=10'}
    hasBin: true

-  performance-now@2.1.0:
-    resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==}
-
  picocolors@1.1.1:
    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}

@@ -3360,9 +3278,6 @@ packages:
    resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==}
    engines: {node: '>= 0.10'}

-  psl@1.15.0:
-    resolution: {integrity: sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==}
-
  pstree.remy@1.1.8:
    resolution: {integrity: sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==}

@@ -3390,10 +3305,6 @@ packages:
    resolution: {integrity: sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg==}
    engines: {node: '>=0.6'}

-  qs@6.5.3:
-    resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==}
-    engines: {node: '>=0.6'}
-
  querystring-es3@0.2.1:
    resolution: {integrity: sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==}
    engines: {node: '>=0.4.x'}
@@ -3524,11 +3435,6 @@ packages:
    resolution: {integrity: sha512-CHPV/GAglbIB1tnQgaiysb8H2yCy8WQ7lcEwQ/eT+kLj0QHV8LnJW0zpqpE7RSkrMSRoa+EBoag86clf7WAgSg==}
    engines: {node: '>= 0.10'}

-  request@2.88.2:
-    resolution: {integrity: sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==}
-    engines: {node: '>= 6'}
-    deprecated: request has been deprecated, see https://github.com/request/request/issues/3142
-
  require-directory@2.1.1:
    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
    engines: {node: '>=0.10.0'}
@@ -3790,11 +3696,6 @@ packages:
  sprintf-js@1.1.3:
    resolution: {integrity: sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==}

-  sshpk@1.18.0:
-    resolution: {integrity: sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==}
-    engines: {node: '>=0.10.0'}
-    hasBin: true
-
  stack-trace@0.0.10:
    resolution: {integrity: sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==}

@@ -4010,22 +3911,12 @@ packages:
    resolution: {integrity: sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==}
    hasBin: true

-  tough-cookie@2.5.0:
-    resolution: {integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==}
-    engines: {node: '>=0.8'}
-
  transform-ast@2.4.4:
    resolution: {integrity: sha512-AxjeZAcIOUO2lev2GDe3/xZ1Q0cVGjIMk5IsriTy8zbWlsEnjeB025AhkhBJHoy997mXpLd4R+kRbvnnQVuQHQ==}

  tty-browserify@0.0.1:
    resolution: {integrity: sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==}

-  tunnel-agent@0.6.0:
-    resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
-
-  tweetnacl@0.14.5:
-    resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==}
-
  type-check@0.3.2:
    resolution: {integrity: sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==}
    engines: {node: '>= 0.8.0'}
@@ -4112,6 +4003,10 @@ packages:
  undici-types@6.20.0:
    resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==}

+  undici@7.4.0:
+    resolution: {integrity: sha512-PUQM3/es3noM24oUn10u3kNNap0AbxESOmnssmW+dOi9yGwlUSi5nTNYl3bNbTkWOF8YZDkx2tCmj9OtQ3iGGw==}
+    engines: {node: '>=20.18.1'}
+
  unicode-canonical-property-names-ecmascript@2.0.1:
    resolution: {integrity: sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==}
    engines: {node: '>=4'}
@@ -5376,10 +5271,6 @@ snapshots:
      inherits: 2.0.4
      minimalistic-assert: 1.0.1

-  asn1@0.2.6:
-    dependencies:
-      safer-buffer: 2.1.2
-
  assert-plus@1.0.0: {}

  assert@1.5.1:
@@ -5404,8 +5295,6 @@ snapshots:
    dependencies:
      async-done: 1.3.2

-  asynckit@0.4.0: {}
-
  atob@2.1.2: {}

  automerge@1.0.1-preview.7:
@@ -5418,13 +5307,9 @@ snapshots:
    dependencies:
      possible-typed-array-names: 1.0.0

-  aws-sign2@0.7.0: {}
-
-  aws4@1.13.2: {}
-
  axios@0.21.4:
    dependencies:
-      follow-redirects: 1.15.9
+      follow-redirects: 1.15.9(debug@4.4.0)
    transitivePeerDependencies:
      - debug

@@ -5491,10 +5376,6 @@ snapshots:
      mixin-deep: 1.3.2
      pascalcase: 0.1.1

-  bcrypt-pbkdf@1.0.2:
-    dependencies:
-      tweetnacl: 0.14.5
-
  binary-extensions@1.13.1: {}

  binary-extensions@2.3.0: {}
@@ -5779,8 +5660,6 @@ snapshots:

  caniuse-lite@1.0.30001692: {}

-  caseless@0.12.0: {}
-
  chai@4.5.0:
    dependencies:
      assertion-error: 1.1.0
@@ -5908,10 +5787,6 @@ snapshots:
      lodash.memoize: 3.0.4
      source-map: 0.5.7

-  combined-stream@1.0.8:
-    dependencies:
-      delayed-stream: 1.0.0
-
  commander@2.20.3: {}

  commander@6.2.1: {}
@@ -6050,10 +5925,6 @@ snapshots:

  dash-ast@2.0.1: {}

-  dashdash@1.14.1:
-    dependencies:
-      assert-plus: 1.0.0
-
  data-view-buffer@1.0.2:
    dependencies:
      call-bound: 1.0.3
@@ -6144,8 +6015,6 @@ snapshots:

  defined@1.0.1: {}

-  delayed-stream@1.0.0: {}
-
  depd@2.0.0: {}

  deps-sort@2.0.1:
@@ -6223,11 +6092,6 @@ snapshots:
      is-plain-object: 2.0.4
      object.defaults: 1.1.0

-  ecc-jsbn@0.1.2:
-    dependencies:
-      jsbn: 0.1.1
-      safer-buffer: 2.1.2
-
  ee-first@1.1.1: {}

  electron-to-chromium@1.5.80: {}
@@ -6767,7 +6631,9 @@ snapshots:
      inherits: 2.0.4
      readable-stream: 2.3.8

-  follow-redirects@1.15.9: {}
+  follow-redirects@1.15.9(debug@4.4.0):
+    optionalDependencies:
+      debug: 4.4.0(supports-color@8.1.1)

  for-each@0.3.3:
    dependencies:
@@ -6779,16 +6645,8 @@ snapshots:
    dependencies:
      for-in: 1.0.2

-  forever-agent@0.6.1: {}
-
  fork-stream@0.0.4: {}

-  form-data@2.3.3:
-    dependencies:
-      asynckit: 0.4.0
-      combined-stream: 1.0.8
-      mime-types: 2.1.35
-
  forwarded@0.2.0: {}

  fragment-cache@0.2.1:
@@ -6876,10 +6734,6 @@ snapshots:

  get-value@2.0.6: {}

-  getpass@0.1.7:
-    dependencies:
-      assert-plus: 1.0.0
-
  glob-parent@3.1.0:
    dependencies:
      is-glob: 3.1.0
@@ -7060,13 +6914,6 @@ snapshots:
    dependencies:
      glogg: 1.0.2

-  har-schema@2.0.0: {}
-
-  har-validator@5.1.5:
-    dependencies:
-      ajv: 6.12.6
-      har-schema: 2.0.0
-
  has-ansi@2.0.0:
    dependencies:
      ansi-regex: 2.1.1
@@ -7150,30 +6997,25 @@ snapshots:
      statuses: 2.0.1
      toidentifier: 1.0.1

-  http-proxy-middleware@2.0.7:
+  http-proxy-middleware@3.0.3:
    dependencies:
      '@types/http-proxy': 1.17.15
-      http-proxy: 1.18.1
+      debug: 4.4.0(supports-color@8.1.1)
+      http-proxy: 1.18.1(patch_hash=8071c23044f455271f4d4074ae4c7b81beec17a03aefd158d5f4edd4ef751c11)(debug@4.4.0)
      is-glob: 4.0.3
-      is-plain-obj: 3.0.0
+      is-plain-object: 5.0.0
      micromatch: 4.0.8
    transitivePeerDependencies:
-      - debug
+      - supports-color

-  http-proxy@1.18.1:
+  http-proxy@1.18.1(patch_hash=8071c23044f455271f4d4074ae4c7b81beec17a03aefd158d5f4edd4ef751c11)(debug@4.4.0):
    dependencies:
      eventemitter3: 4.0.7
-      follow-redirects: 1.15.9
+      follow-redirects: 1.15.9(debug@4.4.0)
      requires-port: 1.0.0
    transitivePeerDependencies:
      - debug

-  http-signature@1.2.0:
-    dependencies:
-      assert-plus: 1.0.0
-      jsprim: 1.4.2
-      sshpk: 1.18.0
-
  https-browserify@1.0.0: {}

  iconv-lite@0.4.24:
@@ -7382,8 +7224,6 @@ snapshots:

  is-plain-obj@2.1.0: {}

-  is-plain-obj@3.0.0: {}
-
  is-plain-object@2.0.4:
    dependencies:
      isobject: 3.0.1
@@ -7422,8 +7262,6 @@ snapshots:
    dependencies:
      which-typed-array: 1.1.18

-  is-typedarray@1.0.0: {}
-
  is-unc-path@1.0.0:
    dependencies:
      unc-path-regex: 0.1.2
@@ -7461,8 +7299,6 @@ snapshots:

  isobject@3.0.1: {}

-  isstream@0.1.2: {}
-
  js-base64@3.7.7: {}

  js-tokens@4.0.0: {}
@@ -7476,8 +7312,6 @@ snapshots:
    dependencies:
      argparse: 2.0.1

-  jsbn@0.1.1: {}
-
  jsbn@1.1.0: {}

  jsesc@3.0.2: {}
@@ -7492,19 +7326,10 @@ snapshots:

  json-stable-stringify-without-jsonify@1.0.1: {}

-  json-stringify-safe@5.0.1: {}
-
  json5@2.2.3: {}

  jsonparse@1.3.1: {}

-  jsprim@1.4.2:
-    dependencies:
-      assert-plus: 1.0.0
-      extsprintf: 1.3.0
-      json-schema: 0.4.0
-      verror: 1.10.0
-
  jsprim@2.0.2:
    dependencies:
      assert-plus: 1.0.0
@@ -7889,8 +7714,6 @@ snapshots:

  number-is-nan@1.0.1: {}

-  oauth-sign@0.9.0: {}
-
  object-assign@4.1.1: {}

  object-copy@0.1.0:
@@ -8104,8 +7927,6 @@ snapshots:
      commander: 9.5.0
      source-map-generator: 0.8.0

-  performance-now@2.1.0: {}
-
  picocolors@1.1.1: {}

  picomatch@2.3.1: {}
@@ -8165,10 +7986,6 @@ snapshots:
      forwarded: 0.2.0
      ipaddr.js: 1.9.1

-  psl@1.15.0:
-    dependencies:
-      punycode: 2.3.1
-
  pstree.remy@1.1.8: {}

  public-encrypt@4.0.3:
@@ -8203,8 +8020,6 @@ snapshots:
    dependencies:
      side-channel: 1.1.0

-  qs@6.5.3: {}
-
  querystring-es3@0.2.1: {}

  queue-microtask@1.2.3: {}
@@ -8374,29 +8189,6 @@ snapshots:
      is-absolute: 1.0.0
      remove-trailing-separator: 1.1.0

-  request@2.88.2:
-    dependencies:
-      aws-sign2: 0.7.0
-      aws4: 1.13.2
-      caseless: 0.12.0
-      combined-stream: 1.0.8
-      extend: 3.0.2
-      forever-agent: 0.6.1
-      form-data: 2.3.3
-      har-validator: 5.1.5
-      http-signature: 1.2.0
-      is-typedarray: 1.0.0
-      isstream: 0.1.2
-      json-stringify-safe: 5.0.1
-      mime-types: 2.1.35
-      oauth-sign: 0.9.0
-      performance-now: 2.1.0
-      qs: 6.5.3
-      safe-buffer: 5.2.1
-      tough-cookie: 2.5.0
-      tunnel-agent: 0.6.0
-      uuid: 3.4.0
-
  require-directory@2.1.1: {}

  require-main-filename@1.0.1: {}
@@ -8694,18 +8486,6 @@ snapshots:

  sprintf-js@1.1.3: {}

-  sshpk@1.18.0:
-    dependencies:
-      asn1: 0.2.6
-      assert-plus: 1.0.0
-      bcrypt-pbkdf: 1.0.2
-      dashdash: 1.14.1
-      ecc-jsbn: 0.1.2
-      getpass: 0.1.7
-      jsbn: 0.1.1
-      safer-buffer: 2.1.2
-      tweetnacl: 0.14.5
-
  stack-trace@0.0.10: {}

  static-eval@0.2.4:
@@ -8993,11 +8773,6 @@ snapshots:

  touch@3.1.1: {}

-  tough-cookie@2.5.0:
-    dependencies:
-      psl: 1.15.0
-      punycode: 2.3.1
-
  transform-ast@2.4.4:
    dependencies:
      acorn-node: 1.8.2
@@ -9010,12 +8785,6 @@ snapshots:

  tty-browserify@0.0.1: {}

-  tunnel-agent@0.6.0:
-    dependencies:
-      safe-buffer: 5.2.1
-
-  tweetnacl@0.14.5: {}
-
  type-check@0.3.2:
    dependencies:
      prelude-ls: 1.1.2
@@ -9137,6 +8906,8 @@ snapshots:

  undici-types@6.20.0: {}

+  undici@7.4.0: {}
+
  unicode-canonical-property-names-ecmascript@2.0.1: {}

  unicode-match-property-ecmascript@2.0.0:
--- a/backend/src/core/proxy-utils/index.js
+++ b/backend/src/core/proxy-utils/index.js
@@ -518,6 +518,14 @@ function lastParse(proxy) {
        proxy['obfs-password'] = proxy.obfs;
        proxy.obfs = 'salamander';
    }
+    if (
+        ['hysteria2'].includes(proxy.type) &&
+        !proxy['obfs-password'] &&
+        proxy['obfs_password']
+    ) {
+        proxy['obfs-password'] = proxy['obfs_password'];
+        delete proxy['obfs_password'];
+    }
    if (['vless'].includes(proxy.type)) {
        // 删除 reality-opts: {}
        if (
--- a/backend/src/core/proxy-utils/parsers/index.js
+++ b/backend/src/core/proxy-utils/parsers/index.js
@@ -775,6 +775,7 @@ function URI_Hysteria2() {
        ] = /^(.*?)@(.*?)(:((\d+(-\d+)?)([,;]\d+(-\d+)?)*))?\/?(\?(.*?))?(?:#(.*?))?$/.exec(
            line,
        );
+
        /* eslint-enable no-unused-vars */
        if (/^\d+$/.test(port)) {
            port = parseInt(`${port}`, 10);
@@ -818,12 +819,23 @@ function URI_Hysteria2() {
        if (params.obfs && params.obfs !== 'none') {
            proxy.obfs = params.obfs;
        }
-
-        proxy.ports = params.mport;
+        if (params.mport) {
+            proxy.ports = params.mport;
+        }
        proxy['obfs-password'] = params['obfs-password'];
        proxy['skip-cert-verify'] = /(TRUE)|1/i.test(params.insecure);
        proxy.tfo = /(TRUE)|1/i.test(params.fastopen);
        proxy['tls-fingerprint'] = params.pinSHA256;
+        let hop_interval = params['hop-interval'] || params['hop_interval'];
+
+        if (/^\d+$/.test(hop_interval)) {
+            proxy['hop-interval'] = parseInt(`${hop_interval}`, 10);
+        }
+        let keepalive = params['keepalive'];
+
+        if (/^\d+$/.test(keepalive)) {
+            proxy['keepalive'] = parseInt(`${keepalive}`, 10);
+        }

        return proxy;
    };
--- a/backend/src/core/proxy-utils/parsers/peggy/surge.js
+++ b/backend/src/core/proxy-utils/parsers/peggy/surge.js
@@ -246,7 +246,7 @@ block_quic = comma "block-quic" equals match:[^,]+ { proxy["block-quic"] = match
 udp_port = comma "udp-port" equals match:$[0-9]+ { proxy["udp-port"] = parseInt(match.trim()); }
 shadow_tls_version = comma "shadow-tls-version" equals match:$[0-9]+ { proxy["shadow-tls-version"] = parseInt(match.trim()); }
 shadow_tls_sni = comma "shadow-tls-sni" equals match:[^,]+ { proxy["shadow-tls-sni"] = match.join(""); }
-shadow_tls_password = comma "shadow-tls-password" equals match:[^,]+ { proxy["shadow-tls-password"] = match.join(""); }
+shadow_tls_password = comma "shadow-tls-password" equals match:[^,]+ { proxy["shadow-tls-password"] = match.join("").replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
 token = comma "token" equals match:[^,]+ { proxy.token = match.join(""); }
 alpn = comma "alpn" equals match:[^,]+ { proxy.alpn = match.join(""); }
 uuidk = comma "uuid" equals match:[^,]+ { proxy.uuid = match.join(""); }
--- a/backend/src/core/proxy-utils/parsers/peggy/surge.peg
+++ b/backend/src/core/proxy-utils/parsers/peggy/surge.peg
@@ -243,7 +243,7 @@ block_quic = comma "block-quic" equals match:[^,]+ { proxy["block-quic"] = match
 udp_port = comma "udp-port" equals match:$[0-9]+ { proxy["udp-port"] = parseInt(match.trim()); }
 shadow_tls_version = comma "shadow-tls-version" equals match:$[0-9]+ { proxy["shadow-tls-version"] = parseInt(match.trim()); }
 shadow_tls_sni = comma "shadow-tls-sni" equals match:[^,]+ { proxy["shadow-tls-sni"] = match.join(""); }
-shadow_tls_password = comma "shadow-tls-password" equals match:[^,]+ { proxy["shadow-tls-password"] = match.join(""); }
+shadow_tls_password = comma "shadow-tls-password" equals match:[^,]+ { proxy["shadow-tls-password"] = match.join("").replace(/^"(.*?)"$/, '$1').replace(/^'(.*?)'$/, '$1'); }
 token = comma "token" equals match:[^,]+ { proxy.token = match.join(""); }
 alpn = comma "alpn" equals match:[^,]+ { proxy.alpn = match.join(""); }
 uuidk = comma "uuid" equals match:[^,]+ { proxy.uuid = match.join(""); }
--- a/backend/src/core/proxy-utils/producers/clashmeta.js
+++ b/backend/src/core/proxy-utils/producers/clashmeta.js
@@ -10,6 +10,47 @@ export default function ClashMeta_Producer() {
                    return false;
                } else if (['juicity'].includes(proxy.type)) {
                    return false;
+                } else if (
+                    ['ss'].includes(proxy.type) &&
+                    ![
+                        'aes-128-ctr',
+                        'aes-192-ctr',
+                        'aes-256-ctr',
+                        'aes-128-cfb',
+                        'aes-192-cfb',
+                        'aes-256-cfb',
+                        'aes-128-gcm',
+                        'aes-192-gcm',
+                        'aes-256-gcm',
+                        'aes-128-ccm',
+                        'aes-192-ccm',
+                        'aes-256-ccm',
+                        'aes-128-gcm-siv',
+                        'aes-256-gcm-siv',
+                        'chacha20-ietf',
+                        'chacha20',
+                        'xchacha20',
+                        'chacha20-ietf-poly1305',
+                        'xchacha20-ietf-poly1305',
+                        'chacha8-ietf-poly1305',
+                        'xchacha8-ietf-poly1305',
+                        '2022-blake3-aes-128-gcm',
+                        '2022-blake3-aes-256-gcm',
+                        '2022-blake3-chacha20-poly1305',
+                        'lea-128-gcm',
+                        'lea-192-gcm',
+                        'lea-256-gcm',
+                        'rabbit128-poly1305',
+                        'aegis-128l',
+                        'aegis-256',
+                        'aez-384',
+                        'deoxys-ii-256-128',
+                        'rc4-md5',
+                        'none',
+                    ].includes(proxy.cipher)
+                ) {
+                    // https://wiki.metacubex.one/config/proxies/ss/#cipher
+                    return false;
                }
                return true;
            })
--- a/backend/src/core/proxy-utils/producers/sing-box.js
+++ b/backend/src/core/proxy-utils/producers/sing-box.js
@@ -587,16 +587,14 @@ const hysteria2Parser = (proxy = {}, includeUnsupportedProxy) => {
    };
    if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
        throw 'invalid port';
-    if (includeUnsupportedProxy) {
-        if (proxy['hop-interval'])
-            parsedProxy.hop_interval = /^\d+$/.test(proxy['hop-interval'])
-                ? `${proxy['hop-interval']}s`
-                : proxy['hop-interval'];
-        if (proxy['ports'])
-            parsedProxy.server_ports = proxy['ports']
-                .split(/\s*,\s*/)
-                .map((p) => p.replace(/\s*-\s*/g, ':'));
-    }
+    if (proxy['hop-interval'])
+        parsedProxy.hop_interval = /^\d+$/.test(proxy['hop-interval'])
+            ? `${proxy['hop-interval']}s`
+            : proxy['hop-interval'];
+    if (proxy['ports'])
+        parsedProxy.server_ports = proxy['ports']
+            .split(/\s*,\s*/)
+            .map((p) => p.replace(/\s*-\s*/g, ':'));
    if (proxy.up) parsedProxy.up_mbps = parseInt(`${proxy.up}`, 10);
    if (proxy.down) parsedProxy.down_mbps = parseInt(`${proxy.down}`, 10);
    if (proxy.obfs === 'salamander') parsedProxy.obfs.type = 'salamander';
--- a/backend/src/core/proxy-utils/producers/stash.js
+++ b/backend/src/core/proxy-utils/producers/stash.js
@@ -47,7 +47,11 @@ export default function Stash_Producer() {
                                : []),
                        ].includes(proxy.cipher)) ||
                    (proxy.type === 'snell' && String(proxy.version) === '4') ||
-                    (proxy.type === 'vless' && proxy['reality-opts'])
+                    (opts['include-unsupported-proxy']
+                        ? proxy.type === 'vless' &&
+                          proxy['reality-opts'] &&
+                          !['xtls-rprx-vision'].includes(proxy.flow)
+                        : proxy.type === 'vless' && proxy['reality-opts'])
                ) {
                    return false;
                }
--- a/backend/src/core/proxy-utils/producers/surgemac.js
+++ b/backend/src/core/proxy-utils/producers/surgemac.js
@@ -141,10 +141,19 @@ function mihomo(proxy, type, opts) {
                        dns: {
                            enable: true,
                            ipv6,
-                            nameserver: [
-                                'https://223.6.6.6/dns-query',
-                                'https://120.53.53.53/dns-query',
-                            ],
+                            'default-nameserver': opts?.defaultNameserver ||
+                                proxy._defaultNameserver || [
+                                    '180.76.76.76',
+                                    '52.80.52.52',
+                                    '119.28.28.28',
+                                    '223.6.6.6',
+                                ],
+                            nameserver: opts?.nameserver ||
+                                proxy._nameserver || [
+                                    'https://doh.pub/dns-query',
+                                    'https://dns.alidns.com/dns-query',
+                                    'https://doh-pure.onedns.net/dns-query',
+                                ],
                        },
                        proxies: [
                            {
--- a/backend/src/core/proxy-utils/producers/uri.js
+++ b/backend/src/core/proxy-utils/producers/uri.js
@@ -387,6 +387,14 @@ export default function URI_Producer() {
                break;
            case 'hysteria2':
                let hysteria2params = [];
+                if (proxy['hop-interval']) {
+                    hysteria2params.push(
+                        `hop-interval=${proxy['hop-interval']}`,
+                    );
+                }
+                if (proxy['keepalive']) {
+                    hysteria2params.push(`keepalive=${proxy['keepalive']}`);
+                }
                if (proxy['skip-cert-verify']) {
                    hysteria2params.push(`insecure=1`);
                }
--- a/backend/src/restful/index.js
+++ b/backend/src/restful/index.js
@@ -194,11 +194,12 @@ export default function serve() {

            const staticFileMiddleware = express_.static(fe_path);

-            let be_share_rewrite = '/share/:type/:name';
-            let be_api_rewrite = '';
-            let be_download_rewrite = '';
            let be_api = '/api/';
            let be_download = '/download/';
+            let be_share = '/share/';
+            let be_download_rewrite = '';
+            let be_api_rewrite = '';
+            let be_share_rewrite = `${be_share}:type/:name`;
            if (fe_be_path) {
                if (!fe_be_path.startsWith('/')) {
                    throw new Error(
@@ -217,7 +218,7 @@ export default function serve() {
                    createProxyMiddleware({
                        target: `http://127.0.0.1:${port}`,
                        changeOrigin: true,
-                        pathRewrite: (path, req) => {
+                        pathRewrite: async (path, req) => {
                            if (req.method.toLowerCase() !== 'get')
                                throw new Error('Method not allowed');
                            const tokens = $.read(TOKENS_KEY) || [];
@@ -229,34 +230,26 @@ export default function serve() {
                                    (t.exp == null || t.exp > Date.now()),
                            );
                            if (!token) throw new Error('Forbbiden');
-                            return path;
+                            return req.originalUrl;
                        },
                    }),
                );
                app.use(
                    be_api_rewrite,
                    createProxyMiddleware({
-                        target: `http://127.0.0.1:${port}`,
-                        pathRewrite: (path) => {
-                            const newPath = path.startsWith(be_api_rewrite)
-                                ? path.replace(be_api_rewrite, be_api)
-                                : path;
-                            return newPath.includes('?')
-                                ? `${newPath}&share=true`
-                                : `${newPath}?share=true`;
+                        target: `http://127.0.0.1:${port}${be_api}`,
+                        pathRewrite: async (path) => {
+                            return path.includes('?')
+                                ? `${path}&share=true`
+                                : `${path}?share=true`;
                        },
                    }),
                );
                app.use(
                    be_download_rewrite,
                    createProxyMiddleware({
-                        target: `http://127.0.0.1:${port}`,
+                        target: `http://127.0.0.1:${port}${be_download}`,
                        changeOrigin: true,
-                        pathRewrite: (path) => {
-                            return path.startsWith(be_download_rewrite)
-                                ? path.replace(be_download_rewrite, be_download)
-                                : path;
-                        },
                    }),
                );
            }
--- a/backend/src/restful/preview.js
+++ b/backend/src/restful/preview.js
@@ -31,7 +31,12 @@ async function previewFile(req, res) {
                        .filter((i) => i.length)
                        .map(async (url) => {
                            try {
-                                return await download(url, file.ua);
+                                return await download(
+                                    url,
+                                    file.ua,
+                                    undefined,
+                                    file.proxy,
+                                );
                            } catch (err) {
                                errors[url] = err;
                                $.error(
--- a/backend/src/restful/sync.js
+++ b/backend/src/restful/sync.js
@@ -411,7 +411,6 @@ async function produceArtifact({
        const file = findByName(allFiles, name);
        if (!file) throw new Error(`找不到文件 ${name}`);
        let raw = '';
-        console.log(file);
        if (file.type !== 'mihomoProfile') {
            if (
                content &&
--- a/backend/src/vendor/express.js
+++ b/backend/src/vendor/express.js
@@ -17,7 +17,12 @@ export default function express({ substore: $, port, host }) {
        const express_ = eval(`require("express")`);
        const bodyParser = eval(`require("body-parser")`);
        const app = express_();
-        app.use(bodyParser.json({ verify: rawBodySaver, limit: '1mb' }));
+        app.use(
+            bodyParser.json({
+                verify: rawBodySaver,
+                limit: eval('process.env.SUB_STORE_BODY_JSON_LIMIT') || '1mb',
+            }),
+        );
        app.use(
            bodyParser.urlencoded({ verify: rawBodySaver, extended: true }),
        );
--- a/backend/src/vendor/open-api.js
+++ b/backend/src/vendor/open-api.js
@@ -337,45 +337,89 @@ export function HTTP(defaultOptions = { baseURL: '' }) {
                opts: options.opts,
            });
        } else if (isLoon || isSurge || isNode) {
-            worker = new Promise((resolve, reject) => {
-                const request = isNode
-                    ? eval("require('request')")
-                    : $httpClient;
+            worker = new Promise(async (resolve, reject) => {
                const body = options.body;
                const opts = JSON.parse(JSON.stringify(options));
                opts.body = body;
-
-                if (!isNode && opts.timeout) {
+                opts.timeout = opts.timeout || 8000;
+                if (opts.timeout) {
                    opts.timeout++;
-                    let unit = 'ms';
-                    // 这些客户端单位为 s
-                    if (isSurge || isStash || isShadowRocket) {
-                        opts.timeout = Math.ceil(opts.timeout / 1000);
-                        unit = 's';
+                    if (isNaN(opts.timeout)) {
+                        opts.timeout = 8000;
+                    }
+                    if (!isNode) {
+                        let unit = 'ms';
+                        // 这些客户端单位为 s
+                        if (isSurge || isStash || isShadowRocket) {
+                            opts.timeout = Math.ceil(opts.timeout / 1000);
+                            unit = 's';
+                        }
+                        // Loon 为 ms
+                        // console.log(`[httpClient timeout] ${opts.timeout}${unit}`);
                    }
-                    // Loon 为 ms
-                    // console.log(`[httpClient timeout] ${opts.timeout}${unit}`);
                }
-                request[method.toLowerCase()](opts, (err, response, body) => {
-                    // if (err) {
-                    //     console.log(err);
-                    // } else {
-                    //     console.log({
-                    //         statusCode:
-                    //             response.status || response.statusCode,
-                    //         headers: response.headers,
-                    //         body,
-                    //     });
-                    // }
-
-                    if (err) reject(err);
-                    else
-                        resolve({
-                            statusCode: response.status || response.statusCode,
-                            headers: response.headers,
-                            body,
+                if (isNode) {
+                    const undici = eval("require('undici')");
+                    const { ProxyAgent, EnvHttpProxyAgent, request } = undici;
+                    const agentOpts = {
+                        connect: {
+                            rejectUnauthorized:
+                                opts.strictSSL === false ||
+                                opts.insecure === true
+                                    ? false
+                                    : true,
+                        },
+                        bodyTimeout: opts.timeout,
+                        headersTimeout: opts.timeout,
+                    };
+                    try {
+                        const response = await request(opts.url, {
+                            ...opts,
+                            method: method.toUpperCase(),
+                            dispatcher: opts.proxy
+                                ? new ProxyAgent({
+                                      ...agentOpts,
+                                      uri: opts.proxy,
+                                  })
+                                : new EnvHttpProxyAgent(agentOpts),
                        });
-                });
+                        resolve({
+                            statusCode: response.statusCode,
+                            headers: response.headers,
+                            body:
+                                opts.encoding === null
+                                    ? await response.body.arrayBuffer()
+                                    : await response.body.text(),
+                        });
+                    } catch (e) {
+                        reject(e);
+                    }
+                } else {
+                    $httpClient[method.toLowerCase()](
+                        opts,
+                        (err, response, body) => {
+                            // if (err) {
+                            //     console.log(err);
+                            // } else {
+                            //     console.log({
+                            //         statusCode:
+                            //             response.status || response.statusCode,
+                            //         headers: response.headers,
+                            //         body,
+                            //     });
+                            // }
+
+                            if (err) reject(err);
+                            else
+                                resolve({
+                                    statusCode:
+                                        response.status || response.statusCode,
+                                    headers: response.headers,
+                                    body,
+                                });
+                        },
+                    );
+                }
            });
        } else if (isGUIforCores) {
            worker = new Promise(async (resolve, reject) => {
Author	SHA1	Message	Date
xream	312caa6880	feat: patch http-proxy; 使用 undici 替代 request	2025-03-13 13:02:19 +08:00
xream	15a51e0dd0	fix: 修复文件预览未使用代理策略的问题	2025-03-12 19:44:54 +08:00
xream	8116c78dda	feat: 升级 http-proxy-middleware	2025-03-12 15:30:14 +08:00
xream	6a026a3d07	feat: mihomo hysteria2 兼容 obfs_password 字段 Some checks failed build / build (push) Has been cancelled Details	2025-03-10 23:06:33 +08:00
xream	cef931fa5d	feat: Hysteria2 URI 输入输出支持 hop-interval 和 keepalive 参数, 为保证兼容性, 输出时多端口暂时保持使用 mport 参数	2025-03-10 19:52:15 +08:00
xream	29525b3e22	feat: sing-box hop_interval 和 server_ports 不需要 includeUnsupportedProxy	2025-03-10 19:36:41 +08:00
xream	8f701570e4	feat: Stash 使用 includeUnsupportedProxy 参数开启 XTLS-uTLS-Vision-REALITY(版本>=2.8.0 时自动开启) Some checks failed build / build (push) Has been cancelled Details	2025-03-07 14:09:56 +08:00
xream	3f8269e835	feat: Node.js 环境支持自定义 JSON Body limit, 例: `SUB_STORE_BODY_JSON_LIMIT=10mb`	2025-03-07 13:59:22 +08:00
xream	465b62218a	feat: 验证 mihomo ss cipher Some checks failed build / build (push) Has been cancelled Details	2025-03-05 15:25:16 +08:00
xream	d255390d48	fix: 修复 Surge shadow-tls-password 引号解析 Some checks are pending build / build (push) Waiting to run Details	2025-03-04 22:36:47 +08:00
xream	72c7f4333a	feat: SurgeMac mihomo 配置中支持自定义 DNS	2025-03-04 20:11:22 +08:00