fix: 被识别为 IP4P 的域名解析结果均增加 _IP4P 字段; 修复报错

sub-store-org · Jul 18, 2024 · aa0943a · aa0943a
1 parent a0c1bbb
commit aa0943a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/backend/package.json b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.14.350",
+  "version": "2.14.351",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
   "main": "src/main.js",
   "scripts": {

diff --git a/backend/src/core/proxy-utils/processors/index.js b/backend/src/core/proxy-utils/processors/index.js
@@ -627,16 +627,22 @@ function ResolveDomainOperator({
                               ]
                             : results[p.server];
                         if (type === 'IPv6' && isIPv6(ip)) {
-                            ip = new ipAddress.Address6(ip).correctForm();
+                            try {
+                                ip = new ipAddress.Address6(ip).correctForm();
+                            } catch (e) {
+                                $.error(
+                                    `Failed to parse IPv6 address: ${ip}: ${e}`,
+                                );
+                            }
                             if (/^2001::[^:]+:[^:]+:[^:]+$/.test(ip)) {
+                                p._IP4P = ip;
                                 const { server, port } = parseIP4P(ip);
                                 if (server && port) {
                                     p._domain = p.server;
                                     p.server = server;
                                     p.port = port;
                                     p.resolved = true;
                                     p._IPv4 = p.server;
-                                    p._IP4P = ip;
                                     if (!isIP(p._IP)) {
                                         p._IP = p.server;
                                     }