From f1dfa9c6a21b2f6c72d06a502fc61665d92a6819 Mon Sep 17 00:00:00 2001
From: Mauricio Siu <siumauricio@icloud.com>
Date: Sun, 21 Dec 2025 01:43:09 -0600
Subject: [PATCH] refactor(preview-deployment): remove dynamic import of
 getWebServerSettings and streamline IP retrieval logic

---
 packages/server/src/lib/auth.ts                    | 8 ++++----
 packages/server/src/services/preview-deployment.ts | 5 +----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/server/src/lib/auth.ts b/packages/server/src/lib/auth.ts
index d513eca2b..d0a80a581 100644
--- a/packages/server/src/lib/auth.ts
+++ b/packages/server/src/lib/auth.ts
@@ -9,7 +9,10 @@ import { IS_CLOUD } from "../constants";
 import { db } from "../db";
 import * as schema from "../db/schema";
 import { getUserByToken } from "../services/admin";
-import { getWebServerSettings } from "../services/web-server-settings";
+import {
+	getWebServerSettings,
+	updateWebServerSettings,
+} from "../services/web-server-settings";
 import { getHubSpotUTK, submitToHubSpot } from "../utils/tracking/hubspot";
 import { sendEmail } from "../verification/send-verification-email";
 import { getPublicIpWithFallback } from "../wss/utils";
@@ -124,9 +127,6 @@ const { handler, api } = betterAuth({
 					});
 
 					if (!IS_CLOUD) {
-						const { updateWebServerSettings } = await import(
-							"../services/web-server-settings"
-						);
 						await updateWebServerSettings({
 							serverIp: await getPublicIpWithFallback(),
 						});
diff --git a/packages/server/src/services/preview-deployment.ts b/packages/server/src/services/preview-deployment.ts
index 4afc654c7..1ece3bc53 100644
--- a/packages/server/src/services/preview-deployment.ts
+++ b/packages/server/src/services/preview-deployment.ts
@@ -13,11 +13,11 @@ import { removeDirectoryCode } from "../utils/filesystem/directory";
 import { authGithub } from "../utils/providers/github";
 import { removeTraefikConfig } from "../utils/traefik/application";
 import { manageDomain } from "../utils/traefik/domain";
-import { findUserById } from "./admin";
 import { findApplicationById } from "./application";
 import { removeDeploymentsByPreviewDeploymentId } from "./deployment";
 import { createDomain } from "./domain";
 import { type Github, getIssueComment } from "./github";
+import { getWebServerSettings } from "./web-server-settings";
 
 export type PreviewDeployment = typeof previewDeployments.$inferSelect;
 
@@ -253,9 +253,6 @@ const generateWildcardDomain = async (
 		}
 
 		if (!ip) {
-			const { getWebServerSettings } = await import(
-				"../services/web-server-settings"
-			);
 			const settings = await getWebServerSettings();
 			ip = settings?.serverIp || "";
 		}