fix: 服务器地址为 ipv6 时触发解析

surgioproject · May 5, 2020 · aa79c93 · aa79c93
1 parent c823677
commit aa79c93
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/utils/index.ts b/lib/utils/index.ts
@@ -10,6 +10,7 @@ import { JsonObject } from 'type-fest';
 import { parse, format, URL } from 'url';
 import URLSafeBase64 from 'urlsafe-base64';
 import YAML from 'yaml';
+import net from 'net';
 
 import {
   HttpNodeConfig,
@@ -299,7 +300,7 @@ export const getSurgeNodes = function(
             `local-port = ${config.localPort}`,
           ];
 
-          if (config.hostnameIp) {
+          if (config.hostnameIp && config.hostnameIp.length) {
             configString.push(...config.hostnameIp.map(item => `addresses = ${item}`));
           }
 
@@ -396,7 +397,7 @@ export const getSurgeNodes = function(
               `local-port = ${config.localPort}`,
             ];
 
-            if (config.hostnameIp) {
+            if (config.hostnameIp && config.hostnameIp.length) {
               configString.push(...config.hostnameIp.map(item => `addresses = ${item}`));
             }
 
@@ -1362,7 +1363,8 @@ export const lowercaseHeaderKeys = (headers: Record<string, string>) => {
   return wsHeaders;
 };
 
-export const isIp = (str: string): boolean => /^(?:(?:^|\.)(?:2(?:5[0-5]|[0-4]\d)|1?\d?\d)){4}$/gm.test(str);
+// istanbul ignore next
+export const isIp = (str: string): boolean => net.isIPv4(str) || net.isIPv6(str);
 
 // istanbul ignore next
 export const isNow = () => typeof process.env.NOW_REGION !== 'undefined';