Merged v2.4.0

src/lib/haproxy/configuration.ts

@@ -1,10 +1,9 @@
 import { dev } from '$app/env';
 import got, { type Got } from 'got';
-import mustache from 'mustache';
-import crypto from 'crypto';
 import * as db from '$lib/database';
 import { checkContainer, checkHAProxy } from '.';
 import { asyncExecShell, getDomain, getEngine } from '$lib/common';
+import { supportedServiceTypesAndVersions } from '$lib/components/common';
 
 const url = dev ? 'http://localhost:5555' : 'http://coolify-haproxy:5555';
 
@@ -222,7 +221,7 @@ export async function configureHAProxy(): Promise<void> {
 		const { fqdn, id, type, destinationDocker, destinationDockerId, updatedAt } = service;
 		if (destinationDockerId) {
 			const { engine } = destinationDocker;
-			const found = db.supportedServiceTypesAndVersions.find((a) => a.name === type);
+			const found = supportedServiceTypesAndVersions.find((a) => a.name === type);
 			if (found) {
 				const port = found.ports.main;
 				const publicPort = service[type]?.publicPort;
@@ -263,20 +262,36 @@ export async function configureHAProxy(): Promise<void> {
 			redirectValue,
 			redirectTo: isWWW ? domain.replace('www.', '') : 'www.' + domain
 		});
-	}
-	const output = mustache.render(template, data);
-	const newHash = crypto.createHash('md5').update(output).digest('hex');
-	const { proxyHash, id } = await db.listSettings();
-	if (proxyHash !== newHash) {
-		await db.prisma.setting.update({ where: { id }, data: { proxyHash: newHash } });
-		await haproxy.post(`v2/services/haproxy/configuration/raw`, {
-			searchParams: {
-				skip_version: true
-			},
-			body: output,
-			headers: {
-				'Content-Type': 'text/plain'
+		for (const service of services) {
+			const { fqdn, id, type, destinationDocker, destinationDockerId, updatedAt } = service;
+			if (destinationDockerId) {
+				const { engine } = destinationDocker;
+				const found = supportedServiceTypesAndVersions.find((a) => a.name === type);
+				if (found) {
+					const port = found.ports.main;
+					const publicPort = service[type]?.publicPort;
+					const isRunning = await checkContainer(engine, id);
+					if (fqdn) {
+						const domain = getDomain(fqdn);
+						const isHttps = fqdn.startsWith('https://');
+						const isWWW = fqdn.includes('www.');
+						const redirectValue = `${isHttps ? 'https://' : 'http://'}${domain}%[capture.req.uri]`;
+						if (isRunning) {
+							data.services.push({
+								id,
+								port,
+								publicPort,
+								domain,
+								isRunning,
+								isHttps,
+								redirectValue,
+								redirectTo: isWWW ? domain.replace('www.', '') : 'www.' + domain,
+								updatedAt: updatedAt.getTime()
+							});
+						}
+					}
+				}
 			}
-		});
+		}
 	}
 }

src/lib/haproxy/index.ts

@@ -115,12 +115,12 @@ export async function stopTcpHttpProxy(
 		return error;
 	}
 }
-
 export async function startTcpProxy(
 	destinationDocker: DestinationDocker,
 	id: string,
 	publicPort: number,
-	privatePort: number
+	privatePort: number,
+	volume?: string
 ): Promise<{ stdout: string; stderr: string } | Error> {
 	const { network, engine } = destinationDocker;
 	const host = getEngine(engine);
@@ -136,7 +136,9 @@ export async function startTcpProxy(
 			);
 			const ip = JSON.parse(Config)[0].Gateway;
 			return await asyncExecShell(
-				`DOCKER_HOST=${host} docker run --restart always -e PORT=${publicPort} -e APP=${id} -e PRIVATE_PORT=${privatePort} --add-host 'host.docker.internal:host-gateway' --add-host 'host.docker.internal:${ip}' --network ${network} -p ${publicPort}:${publicPort} --name ${containerName} -d coollabsio/${defaultProxyImageTcp}`
+				`DOCKER_HOST=${host} docker run --restart always -e PORT=${publicPort} -e APP=${id} -e PRIVATE_PORT=${privatePort} --add-host 'host.docker.internal:host-gateway' --add-host 'host.docker.internal:${ip}' --network ${network} -p ${publicPort}:${publicPort} --name ${containerName} ${
+					volume ? `-v ${volume}` : ''
+				} -d coollabsio/${defaultProxyImageTcp}`
 			);
 		}
 	} catch (error) {