From cb22b4ad47816742e7eaa9b9f46f11530b0aae8e Mon Sep 17 00:00:00 2001
From: "Shishkevich D." <135337715+shishkevichd@users.noreply.github.com>
Date: Wed, 18 Jun 2025 23:24:18 +0700
Subject: chore: add new dns features from v25.6.8

* chore: add new dns params

* chore: add `DNS Presets` modal

* chore: edit file names
---
 web/html/xray.html | 51 ++++++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

(limited to 'web/html/xray.html')

diff --git a/web/html/xray.html b/web/html/xray.html
index e051ce15..eb99b794 100644
--- a/web/html/xray.html
+++ b/web/html/xray.html
@@ -128,6 +128,7 @@
 {{template "modals/reverseModal"}}
 {{template "modals/balancerModal"}}
 {{template "modals/dnsModal"}}
+{{template "modals/dnsPresetsModal"}}
 {{template "modals/fakednsModal"}}
 {{template "modals/warpModal"}}
 <script>
@@ -308,16 +309,7 @@
                     { label: 'Netflix', value: 'geosite:netflix' },
                     { label: 'Reddit', value: 'geosite:reddit' },
                     { label: 'Speedtest', value: 'geosite:speedtest' },
-                ],
-                familyProtectDNS: {
-                    "servers": [
-                        "1.1.1.3",  // https://developers.cloudflare.com/1.1.1.1/setup/
-                        "1.0.0.3",
-                        "2606:4700:4700::1113",
-                        "2606:4700:4700::1003"
-                    ],
-                    "queryStrategy": "UseIP"
-                },
+                ]
             },
             defaultObservatory: {
                 subjectSelector: [],
@@ -826,6 +818,16 @@
                 this.obsSettings = '';
                 this.changeObsCode()
             },
+            openDNSPresets() {
+                dnsPresetsModal.show({
+                    title: '{{ i18n "pages.xray.dns.dnsPresetTitle" }}',
+                    selected: (selectedPreset) => {
+                        this.dnsServers = selectedPreset;
+                        
+                        dnsPresetsModal.close();
+                    }
+                });
+            },
             addDNSServer(){
                 dnsModal.show({
                     title: '{{ i18n "pages.xray.dns.add" }}',
@@ -1270,21 +1272,6 @@
                     }
                 },
             },
-            familyProtectSettings: {
-                get: function () {
-                    if (!this.templateSettings || !this.templateSettings.dns || !this.templateSettings.dns.servers) return false;
-                    return ArrayUtils.doAllItemsExist(this.settingsData.familyProtectDNS.servers, this.templateSettings.dns.servers);
-                },
-                set: function (newValue) {
-                    newTemplateSettings = this.templateSettings;
-                    if (newValue) {
-                        newTemplateSettings.dns = this.settingsData.familyProtectDNS;
-                    } else {
-                        newTemplateSettings.dns.servers = newTemplateSettings.dns?.servers?.filter(data => !this.settingsData.familyProtectDNS.servers.includes(data))
-                    }
-                    this.templateSettings = newTemplateSettings;
-                },
-            },
             WarpExist: {
                 get: function() {
                     return this.templateSettings ? this.templateSettings.outbounds.findIndex((o) => o.tag == "warp")>=0  : false;
@@ -1376,6 +1363,20 @@
                     this.templateSettings = newTemplateSettings;
                 }
             },
+            dnsUseSystemHosts: {
+                get: function () {
+                    return this.enableDNS ? this.templateSettings.dns.useSystemHosts : false;
+                },
+                set: function (newValue) {
+                    newTemplateSettings = this.templateSettings;
+                    if (newValue) {
+                        newTemplateSettings.dns.useSystemHosts = newValue;
+                    } else {
+                        delete newTemplateSettings.dns.useSystemHosts
+                    }
+                    this.templateSettings = newTemplateSettings;
+                }
+            },
             dnsStrategy: {
                 get: function () {
                     return this.enableDNS ? this.templateSettings.dns.queryStrategy : null;
-- 
cgit v1.2.3