From cd133838cb29f82ff73b0a330866bf90c0ae76fe Mon Sep 17 00:00:00 2001 From: divocat Date: Thu, 2 Oct 2025 22:45:50 +0300 Subject: [PATCH] feat: add BOOTSTRAP_DNS_SERVER_OPTIONS to constants --- fe-app-podkop/src/constants.ts | 10 ++++++++++ .../resources/view/podkop/additionalTab.js | 11 +++-------- .../htdocs/luci-static/resources/view/podkop/main.js | 11 +++++++++++ 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/fe-app-podkop/src/constants.ts b/fe-app-podkop/src/constants.ts index 130089d..7f39c3f 100644 --- a/fe-app-podkop/src/constants.ts +++ b/fe-app-podkop/src/constants.ts @@ -72,6 +72,16 @@ export const DNS_SERVER_OPTIONS = { 'unfiltered.adguard-dns.com (AdGuard Unfiltered)', 'family.adguard-dns.com': 'family.adguard-dns.com (AdGuard Family)', }; +export const BOOTSTRAP_DNS_SERVER_OPTIONS = { + '77.88.8.8': '77.88.8.8 (Yandex DNS)', + '77.88.8.1': '77.88.8.1 (Yandex DNS)', + '1.1.1.1': '1.1.1.1 (Cloudflare DNS)', + '1.0.0.1': '1.0.0.1 (Cloudflare DNS)', + '8.8.8.8': '8.8.8.8 (Google DNS)', + '8.8.4.4': '8.8.4.4 (Google DNS)', + '9.9.9.9': '9.9.9.9 (Quad9 DNS)', + '9.9.9.11': '9.9.9.11 (Quad9 DNS)', +}; export const DIAGNOSTICS_UPDATE_INTERVAL = 10000; // 10 seconds export const CACHE_TIMEOUT = DIAGNOSTICS_UPDATE_INTERVAL - 1000; // 9 seconds diff --git a/luci-app-podkop/htdocs/luci-static/resources/view/podkop/additionalTab.js b/luci-app-podkop/htdocs/luci-static/resources/view/podkop/additionalTab.js index 397a0d7..d16b68b 100644 --- a/luci-app-podkop/htdocs/luci-static/resources/view/podkop/additionalTab.js +++ b/luci-app-podkop/htdocs/luci-static/resources/view/podkop/additionalTab.js @@ -56,14 +56,9 @@ function createAdditionalSection(mainSection) { }; o = mainSection.taboption('additional', form.Value, 'bootstrap_dns_server', _('Bootstrap DNS server'), _('The DNS server used to look up the IP address of an upstream DNS server')); - o.value('77.88.8.8', '77.88.8.8 (Yandex DNS)'); - o.value('77.88.8.1', '77.88.8.1 (Yandex DNS)'); - o.value('1.1.1.1', '1.1.1.1 (Cloudflare DNS)'); - o.value('1.0.0.1', '1.0.0.1 (Cloudflare DNS)'); - o.value('8.8.8.8', '8.8.8.8 (Google DNS)'); - o.value('8.8.4.4', '8.8.4.4 (Google DNS)'); - o.value('9.9.9.9', '9.9.9.9 (Quad9 DNS)'); - o.value('9.9.9.11', '9.9.9.11 (Quad9 DNS)'); + Object.entries(main.BOOTSTRAP_DNS_SERVER_OPTIONS).forEach(([key, label]) => { + o.value(key, _(label)); + }); o.default = '77.88.8.8'; o.rmempty = false; o.ucisection = 'main'; diff --git a/luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js b/luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js index 36bfda0..de2c75a 100644 --- a/luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js +++ b/luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js @@ -148,6 +148,16 @@ var DNS_SERVER_OPTIONS = { "unfiltered.adguard-dns.com": "unfiltered.adguard-dns.com (AdGuard Unfiltered)", "family.adguard-dns.com": "family.adguard-dns.com (AdGuard Family)" }; +var BOOTSTRAP_DNS_SERVER_OPTIONS = { + "77.88.8.8": "77.88.8.8 (Yandex DNS)", + "77.88.8.1": "77.88.8.1 (Yandex DNS)", + "1.1.1.1": "1.1.1.1 (Cloudflare DNS)", + "1.0.0.1": "1.0.0.1 (Cloudflare DNS)", + "8.8.8.8": "8.8.8.8 (Google DNS)", + "8.8.4.4": "8.8.4.4 (Google DNS)", + "9.9.9.9": "9.9.9.9 (Quad9 DNS)", + "9.9.9.11": "9.9.9.11 (Quad9 DNS)" +}; var DIAGNOSTICS_UPDATE_INTERVAL = 1e4; var CACHE_TIMEOUT = DIAGNOSTICS_UPDATE_INTERVAL - 1e3; var ERROR_POLL_INTERVAL = 1e4; @@ -181,6 +191,7 @@ var COMMAND_SCHEDULING = { }; return baseclass.extend({ ALLOWED_WITH_RUSSIA_INSIDE, + BOOTSTRAP_DNS_SERVER_OPTIONS, BUTTON_FEEDBACK_TIMEOUT, CACHE_TIMEOUT, COMMAND_SCHEDULING,