cache DB settings, used cached db settings in ProxyResolver, PageSpeedProvider, and EgressService

server/src/domain/app-settings/app-settings.service.ts

@@ -23,16 +23,27 @@ export interface ISettingsService {
 	getSettings(): EnvConfig;
 	areStatusPageThemesEnabled(): boolean;
 	getDBSettings(): Promise<Settings>;
+	getCachedDBSettings(): Promise<Settings>;
 	updateDbSettings(newSettings: SettingsUpdate): Promise<Settings>;
 	removeEgressNotification(notificationId: string): Promise<void>;
 }
 
+const DB_SETTINGS_CACHE_TTL_MS = 60_000;
+
+type CachedSettings = {
+	value: Promise<Settings>;
+	expiresAt: number;
+};
 export class SettingsService implements ISettingsService {
 	static SERVICE_NAME = SERVICE_NAME;
 	private settings: EnvConfig;
 	private settingsRepository: ISettingsRepository | null = null;
+	private dbSettingsCache: CachedSettings | null = null;
 
-	constructor(env: ValidatedEnv) {
+	constructor(
+		env: ValidatedEnv,
+		private dbSettingsTTLMs: number = DB_SETTINGS_CACHE_TTL_MS
+	) {
 		this.settings = {
 			jwtSecret: env.JWT_SECRET,
 			jwtTTL: env.TOKEN_TTL as StringValue,
@@ -76,11 +87,14 @@ export class SettingsService implements ISettingsService {
 	}
 
 	updateDbSettings = async (newSettings: SettingsUpdate) => {
-		return await this.getRepository().update(newSettings);
+		const updated = await this.getRepository().update(newSettings);
+		this.dbSettingsCache = null;
+		return updated;
 	};
 
 	removeEgressNotification = async (notificationId: string) => {
 		await this.getRepository().removeEgressNotification(notificationId);
+		this.dbSettingsCache = null;
 	};
 
 	getDBSettings = async () => {
@@ -100,4 +114,17 @@ export class SettingsService implements ISettingsService {
 
 		return settings;
 	};
+
+	getCachedDBSettings = async () => {
+		const hit = this.dbSettingsCache;
+		if (hit && hit.expiresAt > Date.now()) {
+			return hit.value;
+		}
+		const entry: CachedSettings = { value: this.getDBSettings(), expiresAt: Date.now() + this.dbSettingsTTLMs };
+		this.dbSettingsCache = entry;
+		entry.value.catch(() => {
+			if (this.dbSettingsCache === entry) this.dbSettingsCache = null;
+		});
+		return entry.value;
+	};
 }

server/src/domain/egress/egress.service.ts

@@ -173,7 +173,7 @@ export class EgressService implements IEgressService {
 
 	private assess = async (): Promise<EgressAssessment | null> => {
 		try {
-			const settings = await this.settingsService.getDBSettings();
+			const settings = await this.settingsService.getCachedDBSettings();
 			if (!settings.egressCheckEnabled) {
 				return "disabled";
 			}
@@ -250,7 +250,7 @@ export class EgressService implements IEgressService {
 	// Runs on the queue at the configured interval while degraded. Errors propagate so the queue records
 	// the failure and retries with its usual backoff.
 	checkRecovery = async (job: Job): Promise<void> => {
-		const settings = await this.settingsService.getDBSettings();
+		const settings = await this.settingsService.getCachedDBSettings();
 		const state = await this.egressStateRepository.findSingleton();
 		if (!settings.egressCheckEnabled || state.status !== "degraded") {
 			// Feature switched off, recovery recorded by another worker, or state reset: nothing left to poll for.

server/src/service/network/PageSpeedProvider.ts

@@ -22,7 +22,7 @@ export class PageSpeedProvider implements IStatusProvider<PageSpeedStatusPayload
 		const { url, strategy } = monitor;
 		try {
 			if (!url) throw new Error("URL is required for PageSpeed monitor");
-			const dbSettings = await this.settingsService.getDBSettings();
+			const dbSettings = await this.settingsService.getCachedDBSettings();
 			const apiKey = dbSettings?.pagespeedApiKey;
 			const resolvedStrategy = strategy ?? DefaultPageSpeedStrategy;
 			let pageSpeedUrl = `https://pagespeedonline.googleapis.com/pagespeedonline/v5/runPagespeed?url=${encodeURIComponent(

server/src/service/network/ProxyResolver.ts

@@ -73,7 +73,7 @@ export class ProxyResolver implements IProxyResolver {
 	};
 
 	private resolveInherit = async (monitor: Monitor): Promise<string | undefined> => {
-		const settings = await this.getCached("settings", () => this.settingsService.getDBSettings());
+		const settings = await this.settingsService.getCachedDBSettings();
 		if (!settings.globalProxyEnabled) {
 			return undefined;
 		}

server/src/worker/worker.helper.ts

@@ -199,7 +199,7 @@ export class WorkerHelper implements IWorkerHelper {
 	getCleanupRetentionJob = () => {
 		return async () => {
 			try {
-				const settings = await this.settingsService.getDBSettings();
+				const settings = await this.settingsService.getCachedDBSettings();
 
 				const checkTTL = settings.checkTTL; // Check TTL is in DAYS, not MS