fix: Minio urls + domain checks

src/routes/webhooks/traefik/main.json.ts

@@ -7,7 +7,7 @@ import { checkContainer } from '$lib/haproxy';
 import type { RequestHandler } from '@sveltejs/kit';
 
 function configureMiddleware(
-	{ id, port, domain, nakedDomain, isHttps, isWWW, isDualCerts },
+	{ id, container, port, domain, nakedDomain, isHttps, isWWW, isDualCerts },
 	traefik
 ) {
 	if (isHttps) {
@@ -22,7 +22,7 @@ function configureMiddleware(
 			loadbalancer: {
 				servers: [
 					{
-						url: `http://${id}:${port}`
+						url: `http://${container}:${port}`
 					}
 				]
 			}
@@ -109,7 +109,7 @@ function configureMiddleware(
 			loadbalancer: {
 				servers: [
 					{
-						url: `http://${id}:${port}`
+						url: `http://${container}:${port}`
 					}
 				]
 			}
@@ -172,8 +172,7 @@ export const get: RequestHandler = async (event) => {
 			port,
 			destinationDocker,
 			destinationDockerId,
-			settings: { previews, dualCerts },
-			updatedAt
+			settings: { previews, dualCerts }
 		} = application;
 		if (destinationDockerId) {
 			const { engine, network } = destinationDocker;
@@ -186,6 +185,7 @@ export const get: RequestHandler = async (event) => {
 				if (isRunning) {
 					data.applications.push({
 						id,
+						container: id,
 						port: port || 3000,
 						domain,
 						nakedDomain,
@@ -208,14 +208,17 @@ export const get: RequestHandler = async (event) => {
 					if (containers.length > 0) {
 						for (const container of containers) {
 							const previewDomain = `${container.split('-')[1]}.${domain}`;
+							const nakedDomain = previewDomain.replace(/^www\./, '');
 							data.applications.push({
 								id: container,
+								container,
 								port: port || 3000,
 								domain: previewDomain,
 								isRunning,
+								nakedDomain,
 								isHttps,
-								redirectTo: isWWW ? previewDomain.replace('www.', '') : 'www.' + previewDomain,
-								updatedAt: updatedAt.getTime()
+								isWWW,
+								isDualCerts: dualCerts
 							});
 						}
 					}
@@ -254,8 +257,26 @@ export const get: RequestHandler = async (event) => {
 							scriptName = plausibleAnalytics.scriptName;
 						}
 
+						let container = id;
+						let otherDomain = null;
+						let otherNakedDomain = null;
+						let otherIsHttps = null;
+						let otherIsWWW = null;
+
+						if (type === 'minio') {
+							otherDomain = getDomain(service.minio.apiFqdn);
+							otherNakedDomain = otherDomain.replace(/^www\./, '');
+							otherIsHttps = service.minio.apiFqdn.startsWith('https://');
+							otherIsWWW = service.minio.apiFqdn.includes('www.');
+						}
 						data.services.push({
 							id,
+							container,
+							type,
+							otherDomain,
+							otherNakedDomain,
+							otherIsHttps,
+							otherIsWWW,
 							port,
 							publicPort,
 							domain,
@@ -280,6 +301,7 @@ export const get: RequestHandler = async (event) => {
 		const isWWW = fqdn.includes('www.');
 		data.coolify.push({
 			id: dev ? 'host.docker.internal' : 'coolify',
+			container: dev ? 'host.docker.internal' : 'coolify',
 			port: 3000,
 			domain,
 			nakedDomain,
@@ -293,7 +315,18 @@ export const get: RequestHandler = async (event) => {
 	}
 	for (const service of data.services) {
 		const { id, scriptName } = service;
+
 		configureMiddleware(service, traefik);
+		if (service.type === 'minio') {
+			service.id = id + '-minio';
+			service.container = id;
+			service.domain = service.otherDomain;
+			service.nakedDomain = service.otherNakedDomain;
+			service.isHttps = service.otherIsHttps;
+			service.isWWW = service.otherIsWWW;
+			service.port = 9000;
+			configureMiddleware(service, traefik);
+		}
 
 		if (scriptName) {
 			traefik.http.middlewares[`${id}-redir`] = {

src/routes/webhooks/traefik/other.json.ts

@@ -1,9 +1,6 @@
 import { dev } from '$app/env';
-import { asyncExecShell, getDomain, getEngine } from '$lib/common';
-import { supportedServiceTypesAndVersions } from '$lib/components/common';
+import { getDomain } from '$lib/common';
 import * as db from '$lib/database';
-import { listServicesWithIncludes } from '$lib/database';
-import { checkContainer } from '$lib/haproxy';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const get: RequestHandler = async (event) => {
@@ -13,7 +10,7 @@ export const get: RequestHandler = async (event) => {
 		const publicPort = event.url.searchParams.get('publicPort');
 		const type = event.url.searchParams.get('type');
 		let traefik = {};
-		if (publicPort) {
+		if (publicPort && type && privatePort) {
 			if (type === 'tcp') {
 				traefik = {
 					[type]: {
@@ -34,43 +31,97 @@ export const get: RequestHandler = async (event) => {
 					}
 				};
 			} else if (type === 'http') {
-				const service = await db.prisma.service.findFirst({ where: { id } });
-				if (service?.fqdn) {
-					const domain = getDomain(service.fqdn);
-					const isHttps = service.fqdn.startsWith('https://');
-					traefik = {
-						[type]: {
-							routers: {
-								[id]: {
-									entrypoints: [type],
-									rule: `Host(\`${domain}\`)`,
-									service: id
-								}
-							},
-							services: {
-								[id]: {
-									loadbalancer: {
-										servers: [{ url: `http://${id}:${privatePort}` }]
+				const service = await db.prisma.service.findFirst({
+					where: { id },
+					include: { minio: true }
+				});
+				if (service) {
+					if (service.type === 'minio') {
+						if (service?.minio?.apiFqdn) {
+							const {
+								minio: { apiFqdn }
+							} = service;
+							const domain = getDomain(apiFqdn);
+							const isHttps = apiFqdn.startsWith('https://');
+							traefik = {
+								[type]: {
+									routers: {
+										[id]: {
+											entrypoints: [type],
+											rule: `Host(\`${domain}\`)`,
+											service: id
+										}
+									},
+									services: {
+										[id]: {
+											loadbalancer: {
+												servers: [{ url: `http://${id}:${privatePort}` }]
+											}
+										}
 									}
 								}
+							};
+							if (isHttps) {
+								if (dev) {
+									traefik[type].routers[id].tls = {
+										domains: {
+											main: `${domain}`
+										}
+									};
+								} else {
+									traefik[type].routers[id].tls = {
+										certresolver: 'letsencrypt'
+									};
+								}
 							}
 						}
-					};
-					if (isHttps) {
-						if (dev) {
-							traefik[type].routers[id].tls = {
-								domains: {
-									main: `${domain}`
+					} else {
+						if (service?.fqdn) {
+							const domain = getDomain(service.fqdn);
+							const isHttps = service.fqdn.startsWith('https://');
+							traefik = {
+								[type]: {
+									routers: {
+										[id]: {
+											entrypoints: [type],
+											rule: `Host(\`${domain}:${privatePort}\`)`,
+											service: id
+										}
+									},
+									services: {
+										[id]: {
+											loadbalancer: {
+												servers: [{ url: `http://${id}:${privatePort}` }]
+											}
+										}
+									}
 								}
 							};
-						} else {
-							traefik[type].routers[id].tls = {
-								certresolver: 'letsencrypt'
-							};
+							if (isHttps) {
+								if (dev) {
+									traefik[type].routers[id].tls = {
+										domains: {
+											main: `${domain}`
+										}
+									};
+								} else {
+									traefik[type].routers[id].tls = {
+										certresolver: 'letsencrypt'
+									};
+								}
+							}
 						}
 					}
+				} else {
+					return {
+						status: 500
+					};
 				}
 			}
+		} else {
+			return {
+				status: 500
+			};
 		}
 		return {
 			status: 200,