From 73fd763890ec933fb59635a39055e45bb3fd2d7b Mon Sep 17 00:00:00 2001 From: fallenbagel <98979876+Fallenbagel@users.noreply.github.com> Date: Sun, 23 Feb 2025 03:23:03 +0800 Subject: [PATCH] feat(networksettings): cache dns off by default --- server/lib/settings/index.ts | 2 ++ server/utils/dnsCacheManager.ts | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/server/lib/settings/index.ts b/server/lib/settings/index.ts index 115f224f8..92e314bb6 100644 --- a/server/lib/settings/index.ts +++ b/server/lib/settings/index.ts @@ -143,6 +143,7 @@ export interface NetworkSettings { forceIpv4First: boolean; trustProxy: boolean; proxy: ProxySettings; + cacheDns: boolean; } interface PublicSettings { @@ -542,6 +543,7 @@ class Settings { bypassFilter: '', bypassLocalAddresses: true, }, + cacheDns: false, }, }; if (initialSettings) { diff --git a/server/utils/dnsCacheManager.ts b/server/utils/dnsCacheManager.ts index 9dfbb0fda..bfcaece85 100644 --- a/server/utils/dnsCacheManager.ts +++ b/server/utils/dnsCacheManager.ts @@ -313,7 +313,7 @@ class DnsCacheManager { .then((result) => { const preferredFamily = shouldForceIpv4 ? 4 - : getSettings().main.forceIpv4First + : getSettings().network.forceIpv4First ? 4 : 6; @@ -351,7 +351,7 @@ class DnsCacheManager { const preferredFamily = shouldForceIpv4 ? 4 - : getSettings().main.forceIpv4First + : getSettings().network.forceIpv4First ? 4 : 6; @@ -699,7 +699,8 @@ class DnsCacheManager { .filter((a) => a.family === 6) .map((a) => a.address); - const preferIpv4 = this.testMode || getSettings().main.forceIpv4First; + const preferIpv4 = + this.testMode || getSettings().network.forceIpv4First; let activeAddress: string; let family: number; @@ -751,7 +752,7 @@ class DnsCacheManager { throw new Error('No addresses resolved'); } - const preferIpv4 = this.testMode || getSettings().main.forceIpv4First; + const preferIpv4 = this.testMode || getSettings().network.forceIpv4First; let activeAddress: string; let family: number;