fix: Better DNS check to prevent errors

src/routes/applications/[id]/check.json.ts

@@ -1,5 +1,5 @@
 import { dev } from '$app/env';
-import { getDomain, getUserDetails } from '$lib/common';
+import { checkDomainsIsValidInDNS, getDomain, getUserDetails, isDNSValid } from '$lib/common';
 import * as db from '$lib/database';
 import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
@@ -7,16 +7,38 @@ import { promises as dns } from 'dns';
 import getPort from 'get-port';
 import { t } from '$lib/translations';
 
+export const get: RequestHandler = async (event) => {
+	const { status, body } = await getUserDetails(event);
+	if (status === 401) return { status, body };
+	const domain = event.url.searchParams.get('domain');
+	if (!domain) {
+		return {
+			status: 500,
+			body: {
+				message: t.get('application.domain_required')
+			}
+		};
+	}
+	try {
+		await isDNSValid(event, domain);
+		return {
+			status: 200
+		};
+	} catch (error) {
+		return ErrorHandler(error);
+	}
+};
+
 export const post: RequestHandler = async (event) => {
 	const { status, body } = await getUserDetails(event);
 	if (status === 401) return { status, body };
 
 	const { id } = event.params;
-	let { exposePort, fqdn, forceSave } = await event.request.json();
+	let { exposePort, fqdn, forceSave, dualCerts } = await event.request.json();
 	fqdn = fqdn.toLowerCase();
 
 	try {
-		const domain = getDomain(fqdn);
+		const { isDNSCheckEnabled } = await db.prisma.setting.findFirst({});
 		const found = await db.isDomainConfigured({ id, fqdn });
 		if (found) {
 			throw {
@@ -25,26 +47,6 @@ export const post: RequestHandler = async (event) => {
 				})
 			};
 		}
-		if (!dev && !forceSave) {
-			let ip = [];
-			let localIp = [];
-			dns.setServers(['1.1.1.1', '8.8.8.8']);
-
-			try {
-				localIp = await dns.resolve4(event.url.hostname);
-			} catch (error) {}
-			try {
-				ip = await dns.resolve4(domain);
-			} catch (error) {}
-
-			if (localIp?.length > 0) {
-				if (ip?.length === 0 || !ip.includes(localIp[0])) {
-					throw {
-						message: t.get('application.dns_not_set_error', { domain: domain })
-					};
-				}
-			}
-		}
 
 		if (exposePort) {
 			exposePort = Number(exposePort);
@@ -59,6 +61,10 @@ export const post: RequestHandler = async (event) => {
 			}
 		}
 
+		if (isDNSCheckEnabled && !forceSave) {
+			return await checkDomainsIsValidInDNS({ event, fqdn, dualCerts });
+		}
+
 		return {
 			status: 200
 		};

src/routes/applications/[id]/index.svelte

@@ -45,9 +45,9 @@
 	import Explainer from '$lib/components/Explainer.svelte';
 	import Setting from '$lib/components/Setting.svelte';
 	import type Prisma from '@prisma/client';
-	import { notNodeDeployments, staticDeployments } from '$lib/components/common';
+	import { getDomain, notNodeDeployments, staticDeployments } from '$lib/components/common';
 	import { toast } from '@zerodevx/svelte-toast';
-	import { post } from '$lib/api';
+	import { get, post } from '$lib/api';
 	import cuid from 'cuid';
 	import { browser } from '$app/env';
 	import { disabledButton } from '$lib/store';
@@ -63,6 +63,8 @@
 	let dualCerts = application.settings.dualCerts;
 	let autodeploy = application.settings.autodeploy;
 
+	let nonWWWDomain = application.fqdn && getDomain(application.fqdn).replace(/^www\./, '');
+
 	let wsgis = [
 		{
 			value: 'None',
@@ -127,13 +129,16 @@
 	async function handleSubmit() {
 		loading = true;
 		try {
+			nonWWWDomain = application.fqdn && getDomain(application.fqdn).replace(/^www\./, '');
 			await post(`/applications/${id}/check.json`, {
 				fqdn: application.fqdn,
 				forceSave,
+				dualCerts,
 				exposePort: application.exposePort
 			});
 			await post(`/applications/${id}.json`, { ...application });
 			$disabledButton = false;
+			forceSave = false;
 			return toast.push('Configurations saved.');
 		} catch ({ error }) {
 			if (error?.startsWith($t('application.dns_not_set_partial_error'))) {
@@ -155,6 +160,14 @@
 		application.baseBuildImage = event.detail.value;
 		await handleSubmit();
 	}
+	async function isDNSValid(domain) {
+		try {
+			await get(`/applications/${id}/check.json?domain=${domain}`);
+			toast.push('Domain is valid in DNS.');
+		} catch ({ error }) {
+			return errorNotification(error);
+		}
+	}
 </script>
 
 <div class="flex items-center space-x-2 p-5 px-6 font-bold">
@@ -387,16 +400,34 @@
 					{/if}
 					<Explainer text={$t('application.https_explainer')} />
 				</div>
-				<input
-					readonly={!$session.isAdmin || isRunning}
-					disabled={!$session.isAdmin || isRunning}
-					bind:this={domainEl}
-					name="fqdn"
-					id="fqdn"
-					bind:value={application.fqdn}
-					pattern="^https?://([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{'{'}2,{'}'}$"
-					placeholder="eg: https://coollabs.io"
-				/>
+				<div>
+					<input
+						readonly={!$session.isAdmin || isRunning}
+						disabled={!$session.isAdmin || isRunning}
+						bind:this={domainEl}
+						name="fqdn"
+						id="fqdn"
+						bind:value={application.fqdn}
+						pattern="^https?://([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{'{'}2,{'}'}$"
+						placeholder="eg: https://coollabs.io"
+					/>
+					{#if forceSave}
+						<div class="pt-4">
+							<button
+								class="bg-coollabs hover:bg-coollabs-100"
+								on:click|preventDefault={() => isDNSValid(getDomain(nonWWWDomain))}
+								>Check {nonWWWDomain} DNS Record</button
+							>
+							{#if dualCerts}
+								<button
+									class="bg-coollabs hover:bg-coollabs-100"
+									on:click|preventDefault={() => isDNSValid(getDomain(`www.${nonWWWDomain}`))}
+									>Check www.{nonWWWDomain} DNS Record</button
+								>
+							{/if}
+						</div>
+					{/if}
+				</div>
 			</div>
 			<div class="grid grid-cols-2 items-center pb-8">
 				<Setting