feat: 域名解析支持自定义 DoH(需新版前端)

backend/src/core/proxy-utils/index.js

@@ -1,13 +1,8 @@
+import { Buffer } from 'buffer';
 import rs from '@/utils/rs';
 import YAML from '@/utils/yaml';
 import download from '@/utils/download';
-import {
-    isIPv4,
-    isIPv6,
-    isValidPortNumber,
-    isNotBlank,
-    utf8ArrayToStr,
-} from '@/utils';
+import { isIPv4, isIPv6, isValidPortNumber, isNotBlank } from '@/utils';
 import PROXY_PROCESSORS, { ApplyProcessor } from './processors';
 import PROXY_PREPROCESSORS from './preprocessors';
 import PROXY_PRODUCERS from './producers';
@@ -427,6 +422,7 @@ function lastParse(proxy) {
             }
         }
     }
+
     if (typeof proxy.name !== 'string') {
         if (/^\d+$/.test(proxy.name)) {
             proxy.name = `${proxy.name}`;
@@ -435,7 +431,7 @@ function lastParse(proxy) {
                 if (proxy.name?.data) {
                     proxy.name = Buffer.from(proxy.name.data).toString('utf8');
                 } else {
-                    proxy.name = utf8ArrayToStr(proxy.name);
+                    proxy.name = Buffer.from(proxy.name).toString('utf8');
                 }
             } catch (e) {
                 $.error(`proxy.name decode failed\nReason: ${e}`);

backend/src/core/proxy-utils/processors/index.js

@@ -3,6 +3,7 @@ import scriptResourceCache from '@/utils/script-resource-cache';
 import { isIPv4, isIPv6 } from '@/utils';
 import { FULL } from '@/utils/logical';
 import { getFlag, removeFlag } from '@/utils/geo';
+import { doh } from '@/utils/dns';
 import lodash from 'lodash';
 import $ from '@/core/app';
 import { hex_md5 } from '@/vendor/md5';
@@ -390,6 +391,27 @@ function parseIP4P(IP4P) {
 }
 
 const DOMAIN_RESOLVERS = {
+    Custom: async function (domain, type, noCache, timeout, url) {
+        const id = hex_md5(`CUSTOM:${url}:${domain}:${type}`);
+        const cached = resourceCache.get(id);
+        if (!noCache && cached) return cached;
+        const res = await doh({
+            url,
+            domain,
+            type: type === 'IPv6' ? 'AAAA' : 'A',
+            timeout,
+        });
+        const { answers } = res;
+        if (!Array.isArray(answers) || answers.length === 0) {
+            throw new Error('No answers');
+        }
+        const result = answers.map((i) => i?.data).filter((i) => i);
+        if (result.length === 0) {
+            throw new Error('No answers');
+        }
+        resourceCache.set(id, result);
+        return result;
+    },
     Google: async function (domain, type, noCache, timeout) {
         const id = hex_md5(`GOOGLE:${domain}:${type}`);
         const cached = resourceCache.get(id);
@@ -528,6 +550,7 @@ function ResolveDomainOperator({
     type: _type,
     filter,
     cache,
+    url,
     timeout,
 }) {
     if (['IPv6', 'IP4P'].includes(_type) && ['IP-API'].includes(provider)) {
@@ -541,6 +564,7 @@ function ResolveDomainOperator({
     if (!resolver) {
         throw new Error(`找不到域名解析服务提供方: ${provider}`);
     }
+    $.info(`Domain Resolver: [${_type}] ${provider} ${url || ''}`);
     return {
         name: 'Resolve Domain Operator',
         func: async (proxies) => {
@@ -568,6 +592,7 @@ function ResolveDomainOperator({
                             type,
                             cache === 'disabled',
                             requestTimeout,
+                            url,
                         )
                             .then((ip) => {
                                 results[domain] = ip;

backend/src/utils/dns.js

@@ -0,0 +1,55 @@
+import $ from '@/core/app';
+import dnsPacket from 'dns-packet';
+import { Buffer } from 'buffer';
+
+export async function doh({
+    url,
+    domain,
+    type = 'A',
+    timeout,
+    ip = '223.6.6.6',
+}) {
+    const buf = dnsPacket.encode({
+        type: 'query',
+        id: 0,
+        flags: dnsPacket.RECURSION_DESIRED,
+        questions: [
+            {
+                type,
+                name: domain,
+            },
+        ],
+        additionals: [
+            {
+                type: 'OPT',
+                name: '.',
+                udpPayloadSize: 4096,
+                flags: 0,
+                options: [
+                    {
+                        code: 'CLIENT_SUBNET',
+                        ip,
+                        sourcePrefixLength: 24,
+                        scopePrefixLength: 0,
+                    },
+                ],
+            },
+        ],
+    });
+    const res = await $.http.get({
+        url: `${url}?dns=${buf
+            .toString('base64')
+            .toString('utf-8')
+            .replace(/=/g, '')}`,
+        headers: {
+            Accept: 'application/dns-message',
+            // 'Content-Type': 'application/dns-message',
+        },
+        // body: buf,
+        'binary-mode': true,
+        encoding: null, // 使用 null 编码以确保响应是原始二进制数据
+        timeout,
+    });
+
+    return dnsPacket.decode(Buffer.from($.env.isQX ? res.bodyBytes : res.body));
+}

backend/src/utils/index.js

@@ -46,52 +46,52 @@ function getPolicyDescriptor(str) {
           };
 }
 
-const utf8ArrayToStr =
-    typeof TextDecoder !== 'undefined'
-        ? (v) => new TextDecoder().decode(new Uint8Array(v))
-        : (function () {
-              var charCache = new Array(128); // Preallocate the cache for the common single byte chars
-              var charFromCodePt = String.fromCodePoint || String.fromCharCode;
-              var result = [];
+// const utf8ArrayToStr =
+//     typeof TextDecoder !== 'undefined'
+//         ? (v) => new TextDecoder().decode(new Uint8Array(v))
+//         : (function () {
+//               var charCache = new Array(128); // Preallocate the cache for the common single byte chars
+//               var charFromCodePt = String.fromCodePoint || String.fromCharCode;
+//               var result = [];
 
-              return function (array) {
-                  var codePt, byte1;
-                  var buffLen = array.length;
+//               return function (array) {
+//                   var codePt, byte1;
+//                   var buffLen = array.length;
 
-                  result.length = 0;
+//                   result.length = 0;
 
-                  for (var i = 0; i < buffLen; ) {
-                      byte1 = array[i++];
+//                   for (var i = 0; i < buffLen; ) {
+//                       byte1 = array[i++];
 
-                      if (byte1 <= 0x7f) {
-                          codePt = byte1;
-                      } else if (byte1 <= 0xdf) {
-                          codePt = ((byte1 & 0x1f) << 6) | (array[i++] & 0x3f);
-                      } else if (byte1 <= 0xef) {
-                          codePt =
-                              ((byte1 & 0x0f) << 12) |
-                              ((array[i++] & 0x3f) << 6) |
-                              (array[i++] & 0x3f);
-                      } else if (String.fromCodePoint) {
-                          codePt =
-                              ((byte1 & 0x07) << 18) |
-                              ((array[i++] & 0x3f) << 12) |
-                              ((array[i++] & 0x3f) << 6) |
-                              (array[i++] & 0x3f);
-                      } else {
-                          codePt = 63; // Cannot convert four byte code points, so use "?" instead
-                          i += 3;
-                      }
+//                       if (byte1 <= 0x7f) {
+//                           codePt = byte1;
+//                       } else if (byte1 <= 0xdf) {
+//                           codePt = ((byte1 & 0x1f) << 6) | (array[i++] & 0x3f);
+//                       } else if (byte1 <= 0xef) {
+//                           codePt =
+//                               ((byte1 & 0x0f) << 12) |
+//                               ((array[i++] & 0x3f) << 6) |
+//                               (array[i++] & 0x3f);
+//                       } else if (String.fromCodePoint) {
+//                           codePt =
+//                               ((byte1 & 0x07) << 18) |
+//                               ((array[i++] & 0x3f) << 12) |
+//                               ((array[i++] & 0x3f) << 6) |
+//                               (array[i++] & 0x3f);
+//                       } else {
+//                           codePt = 63; // Cannot convert four byte code points, so use "?" instead
+//                           i += 3;
+//                       }
 
-                      result.push(
-                          charCache[codePt] ||
-                              (charCache[codePt] = charFromCodePt(codePt)),
-                      );
-                  }
+//                       result.push(
+//                           charCache[codePt] ||
+//                               (charCache[codePt] = charFromCodePt(codePt)),
+//                       );
+//                   }
 
-                  return result.join('');
-              };
-          })();
+//                   return result.join('');
+//               };
+//           })();
 
 export {
     isIPv4,
@@ -101,6 +101,6 @@ export {
     getIfNotBlank,
     isPresent,
     getIfPresent,
-    utf8ArrayToStr,
+    // utf8ArrayToStr,
     getPolicyDescriptor,
 };

backend/src/vendor/open-api.js

@@ -341,7 +341,10 @@ export function HTTP(defaultOptions = { baseURL: '' }) {
                 const request = isNode
                     ? eval("require('request')")
                     : $httpClient;
+                const body = options.body;
                 const opts = JSON.parse(JSON.stringify(options));
+                opts.body = body;
+
                 if (!isNode && opts.timeout) {
                     opts.timeout++;
                     let unit = 'ms';