Merge pull request #605 from duakc/fix/domain_resolver_can_handle_string

fix: make the proxy._domain_resolver accept string as a server.

Author: xream

backend/src/core/proxy-utils/producers/sing-box.js

@@ -30,9 +30,18 @@ const ipVersionParser = (proxy, parsedProxy) => {
     }
 };
 const domainResolverParser = (proxy, parsedProxy) => {
-    if (proxy._domain_resolver) {
+    if (!proxy._domain_resolver) {
+        return;
+    }
+
+    if (typeof proxy._domain_resolver === 'string') {
+        parsedProxy.domain_resolver = {
+            ...(parsedProxy.domain_resolver ?? {}),
+            server: proxy._domain_resolver,
+        };
+    } else {
         parsedProxy.domain_resolver = {
-            ...parsedProxy.domain_resolver,
+            ...(parsedProxy.domain_resolver ?? {}),
             ...proxy._domain_resolver,
         };
     }
@@ -529,10 +538,7 @@ const getShadowTLSPluginOpts = (proxy = {}) => {
     if (proxy.plugin === 'shadow-tls' && proxy['plugin-opts']) {
         return proxy['plugin-opts'];
     }
-    if (
-        proxy.type === 'snell' &&
-        proxy['obfs-opts']?.mode === 'shadow-tls'
-    ) {
+    if (proxy.type === 'snell' && proxy['obfs-opts']?.mode === 'shadow-tls') {
         return {
             host: proxy['obfs-opts'].host,
             password: proxy['obfs-opts'].password,
@@ -734,15 +740,9 @@ const snellParser = (proxy = {}) => {
     if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
         throw 'invalid port';
     if (version != null) parsedProxy.version = version;
-    if (
-        proxy['obfs-opts']?.mode &&
-        proxy['obfs-opts'].mode !== 'shadow-tls'
-    )
+    if (proxy['obfs-opts']?.mode && proxy['obfs-opts'].mode !== 'shadow-tls')
         parsedProxy.obfs_mode = proxy['obfs-opts'].mode;
-    if (
-        proxy['obfs-opts']?.host &&
-        proxy['obfs-opts']?.mode !== 'shadow-tls'
-    )
+    if (proxy['obfs-opts']?.host && proxy['obfs-opts']?.mode !== 'shadow-tls')
         parsedProxy.obfs_host = proxy['obfs-opts'].host;
     if (proxy.reuse && (version == null || version >= 4))
         parsedProxy.reuse = true;