Merge pull request #129 from coollabsio/next

v2.0.10

Dockerfile

@@ -8,6 +8,8 @@ RUN yarn build
 FROM node:16.14.0-alpine
 WORKDIR /app
 
+LABEL coolify.managed true
+
 RUN apk add --no-cache git openssh-client curl jq cmake sqlite
 
 RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@6

README.md

@@ -2,6 +2,66 @@
 
 An open-source & self-hostable Heroku / Netlify alternative.
 
+## Installation
+
+Installation is automated with the following command:
+
+```bash
+/bin/bash -c "$(curl -fsSL https://get.coollabs.io/coolify/install.sh)"
+```
+
+## Migration from v1
+
+A fresh installation is necessary. v2 is not compatible with v1.
+
+## Features
+### Git Sources
+You can use the official ones or your self hosted version!
+
+- Github
+- GitLab
+- Bitbucket (WIP)
+
+### Destinations
+
+- Local Docker Engine
+- Remote Docker Engine (WIP)
+- Kubernetes (WIP)
+
+
+### Applications
+
+- Static sites
+- NodeJS
+- VueJS
+- NuxtJS
+- NextJS
+- React/Preact
+- NextJS
+- Gatsby
+- Svelte
+- PHP
+- Rust
+- Dockerfile (you can provide it)
+
+### Databases
+
+- MongoDB
+- MySQL
+- PostgreSQL
+- CouchDB
+- Redis
+
+### One-click services
+
+- [WordPress](https://wordpress.org)
+- [Plausible Analytics](https://plausible.io)
+- [NocoDB](https://nocodb.com)
+- [VSCode Server](https://github.com/cdr/code-server)
+- [MinIO](https://min.io)
+- [VaultWarden](https://github.com/dani-garcia/vaultwarden)
+
+
 ## Support
 
 - Twitter: [@andrasbacsai](https://twitter.com/andrasbacsai)
@@ -11,7 +71,7 @@ An open-source & self-hostable Heroku / Netlify alternative.
 
 ## Roadmap
 
-[See the Roadmap here](https://github.com/coollabsio/coolify/projects/1)
+[See the Roadmap here](https://github.com/orgs/coollabsio/projects/3/views/8)
 
 ## License
 

docker-compose.yaml

@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   coolify:
-    image: coollabsio/coolify:latest
+    image: coollabsio/coolify:${TAG:-latest}
     restart: always
     container_name: coolify
     ports:

package.json

@@ -1,12 +1,12 @@
 {
 	"name": "coolify",
 	"description": "An open-source & self-hostable Heroku / Netlify alternative.",
-	"version": "2.0.3",
+	"version": "2.0.10",
 	"license": "AGPL-3.0",
 	"scripts": {
-		"dev": "docker-compose -f docker-compose-dev.yaml up -d && NODE_ENV=development svelte-kit dev --host 0.0.0.0",
-		"dev:stop": "docker-compose -f docker-compose-dev.yaml down",
-		"dev:logs": "docker-compose -f docker-compose-dev.yaml logs -f --tail 10",
+		"dev": "docker compose -f docker-compose-dev.yaml up -d && NODE_ENV=development svelte-kit dev --host 0.0.0.0",
+		"dev:stop": "docker compose -f docker-compose-dev.yaml down",
+		"dev:logs": "docker compose -f docker-compose-dev.yaml logs -f --tail 10",
 		"studio": "npx prisma studio",
 		"start": "npx prisma migrate deploy && npx prisma generate && npx prisma db seed && node index.js",
 		"build": "svelte-kit build",
@@ -16,8 +16,9 @@
 		"db:generate": "prisma generate",
 		"db:push": "prisma db push && prisma generate",
 		"db:seed": "prisma db seed",
-		"prerelease": "cross-var docker build -t coollabsio/coolify:$npm_package_version -t coollabsio/coolify:latest .",
-		"release:coolify": "cross-var yarn prerelease && docker push coollabsio/coolify:$npm_package_version && docker image push coollabsio/coolify:$npm_package_version && docker push coollabsio/coolify:latest",
+		"release:staging": "cross-var docker build -t coollabsio/coolify:$npm_package_version . && docker push coollabsio/coolify:$npm_package_version",
+		"release:pre": "cross-var docker build -t coollabsio/coolify:$npm_package_version -t coollabsio/coolify:latest .",
+		"release:coolify": "cross-var yarn release:pre && docker push coollabsio/coolify:$npm_package_version && docker push coollabsio/coolify:latest",
 		"release:haproxy": "docker build -f haproxy.Dockerfile -t coollabsio/coolify-haproxy-alpine:1.0.0 -t coollabsio/coolify-haproxy-alpine:latest . && docker image push --all-tags coollabsio/coolify-haproxy-alpine",
 		"release:haproxy:tcp": "docker build -f haproxy-tcp.Dockerfile -t coollabsio/coolify-haproxy-tcp-alpine:1.0.0 -t coollabsio/coolify-haproxy-tcp-alpine:latest . && docker image push --all-tags coollabsio/coolify-haproxy-tcp-alpine",
 		"release:haproxy:http": "docker build -f haproxy-http.Dockerfile -t coollabsio/coolify-haproxy-http-alpine:1.0.0 -t coollabsio/coolify-haproxy-http-alpine:latest . && docker image push --all-tags coollabsio/coolify-haproxy-http-alpine",

prisma/migrations/20220212142309_unique_secret_by_application/migration.sql

@@ -0,0 +1,11 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[name,applicationId]` on the table `Secret` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- DropIndex
+DROP INDEX "Secret_name_key";
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Secret_name_applicationId_key" ON "Secret"("name", "applicationId");

prisma/schema.prisma

@@ -105,13 +105,15 @@ model ApplicationSettings {
 
 model Secret {
   id            String      @id @default(cuid())
-  name          String      @unique
+  name          String      
   value         String
   isBuildSecret Boolean     @default(false)
   createdAt     DateTime    @default(now())
   updatedAt     DateTime    @updatedAt
   application   Application @relation(fields: [applicationId], references: [id])
   applicationId String
+
+  @@unique([name, applicationId])
 }
 
 model BuildLog {

src/app.html

@@ -4,9 +4,6 @@
 		<meta charset="utf-8" />
 		<link rel="icon" href="/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
-		<link rel="dns-prefetch" href="https://cdn.coollabs.io/" />
-		<link rel="preconnect" href="https://cdn.coollabs.io/" crossorigin="" />
-		<link rel="stylesheet" href="https://cdn.coollabs.io/fonts/poppins/poppins.css" />
 		<title>Coolify</title>
 		%svelte.head%
 	</head>

src/lib/buildPacks/php.ts

@@ -11,6 +11,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 	Dockerfile.push(`COPY ./${baseDirectory || ''} /var/www/html`);
 	Dockerfile.push(`EXPOSE 80`);
 	Dockerfile.push('CMD ["apache2-foreground"]');
+	Dockerfile.push('RUN chown -R www-data /var/www/html');
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };
 

src/lib/common.ts

@@ -8,16 +8,26 @@ import * as db from '$lib/database';
 import { buildLogQueue } from './queues';
 
 import { version as currentVersion } from '../../package.json';
-import { dockerInstance } from './docker';
 import dayjs from 'dayjs';
 import Cookie from 'cookie';
+import os from 'os';
 
 try {
 	if (!dev) {
 		Sentry.init({
 			dsn: process.env['COOLIFY_SENTRY_DSN'],
 			tracesSampleRate: 0,
-			environment: 'production'
+			environment: 'production',
+			debug: true,
+			release: currentVersion,
+			initialScope: {
+				tags: {
+					appId: process.env['COOLIFY_APP_ID'],
+					'os.arch': os.arch(),
+					'os.platform': os.platform(),
+					'os.release': os.release()
+				}
+			}
 		});
 	}
 } catch (err) {
@@ -67,7 +77,6 @@ export const getTeam = (event) => {
 };
 
 export const getUserDetails = async (event, isAdminRequired = true) => {
-	// try {
 	const teamId = getTeam(event);
 	const userId = event.locals.session.data.uid || null;
 	const { permission = 'read' } = await db.prisma.permission.findFirst({
@@ -91,18 +100,6 @@ export const getUserDetails = async (event, isAdminRequired = true) => {
 	}
 
 	return payload;
-	// } catch (err) {
-	// 	console.log(err);
-	// 	return {
-	// 		teamId: null,
-	// 		userId: null,
-	// 		permission: 'read',
-	// 		status: 401,
-	// 		body: {
-	// 			message: 'You do not have permission to do this. \nAsk an admin to modify your permissions.'
-	// 		}
-	// 	};
-	// }
 };
 
 export function getEngine(engine) {

src/lib/components/CopyPasswordField.svelte

@@ -20,9 +20,6 @@
 
 	function showActions(value) {
 		actionsShow = value;
-		// if (value === false) {
-		// 	showPassword = false;
-		// }
 	}
 	function copyToClipboard() {
 		if (isHttps && navigator.clipboard) {

src/lib/components/Setting.svelte

@@ -6,7 +6,6 @@
 	export let description;
 	export let isPadding = true;
 	export let disabled = false;
-	// export let disabledReason = '';
 </script>
 
 <li class="flex items-center py-4">
@@ -14,11 +13,6 @@
 		<p class="text-xs font-bold text-stone-100 md:text-base">{title}</p>
 		<Explainer text={description} />
 	</div>
-	<!-- {#if disabled}
-		<div class="flex" class:px-4={isPadding} class:pr-32={!isPadding}>
-			<p class="text-xs font-bold text-stone-400">{disabledReason}</p>
-		</div>
-	{:else} -->
 	<div
 		type="button"
 		on:click

src/lib/components/svg/services/MinIO.svelte

@@ -5,5 +5,5 @@
 <img
 	alt="minio logo"
 	class={isAbsolute ? 'w-7 absolute top-0 left-0 -m-3 -mt-5' : 'w-4  mx-auto'}
-	src="https://cdn.coollabs.io/assets/coolify/services/minio/MINIO_Bird.png"
+	src="/minio.png"
 />

src/lib/components/svg/services/NocoDB.svelte

@@ -5,5 +5,5 @@
 <img
 	alt="nocodb logo"
 	class={isAbsolute ? 'w-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
-	src="https://cdn.coollabs.io/assets/coolify/services/nocodb/nocodb.png"
+	src="/nocodb.png"
 />

src/lib/components/svg/services/PlausibleAnalytics.svelte

@@ -5,5 +5,5 @@
 <img
 	alt="plausible logo"
 	class={isAbsolute ? 'w-10 absolute top-0 left-0 -m-5' : 'w-6 mx-auto'}
-	src="https://cdn.coollabs.io/assets/coolify/services/plausible/logo_sm.png"
+	src="/plausible.png"
 />

src/lib/components/svg/services/VaultWarden.svelte

@@ -0,0 +1,35 @@
+<script lang="ts">
+	export let isAbsolute = false;
+</script>
+
+<svg
+	class={isAbsolute ? 'w-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
+	xmlns="http://www.w3.org/2000/svg"
+	xmlns:xlink="http://www.w3.org/1999/xlink"
+	version="1.1"
+	id="Icon"
+	x="0px"
+	y="0px"
+	viewBox="0 0 1024 1024"
+	style="enable-background:new 0 0 1024 1024;"
+	xml:space="preserve"
+>
+	<style type="text/css">
+		.st0 {
+			fill: #175ddc;
+		}
+		.st1 {
+			fill: #ffffff;
+		}
+	</style>
+	<path
+		id="Background"
+		class="st0"
+		d="M1024,864c0,88.4-71.6,160-160,160H160C71.6,1024,0,952.4,0,864V160C0,71.6,71.6,0,160,0h704  c88.4,0,160,71.6,160,160V864z"
+	/>
+	<path
+		id="Identity"
+		class="st1"
+		d="M829.8,128.6c-6.5-6.5-14.2-9.7-23-9.7H217.2c-8.9,0-16.5,3.2-23,9.7c-6.5,6.5-9.7,14.2-9.7,23  v393.1c0,29.3,5.7,58.4,17.1,87.3c11.4,28.8,25.6,54.4,42.5,76.8c16.9,22.3,37,44.1,60.4,65.3c23.4,21.2,45,38.7,64.7,52.7  c19.8,14,40.4,27.2,61.9,39.7c21.5,12.5,36.8,20.9,45.8,25.3c9,4.4,16.3,7.9,21.7,10.2c4.1,2,8.5,3.1,13.3,3.1c4.8,0,9.2-1,13.3-3.1  c5.5-2.4,12.7-5.8,21.8-10.2c9-4.4,24.3-12.9,45.8-25.3c21.5-12.5,42.1-25.7,61.9-39.7c19.8-14,41.4-31.6,64.8-52.7  c23.4-21.2,43.5-42.9,60.4-65.3c16.9-22.4,31-47.9,42.5-76.8c11.4-28.8,17.1-57.9,17.1-87.3V151.7  C839.6,142.8,836.3,135.1,829.8,128.6z M753.8,548.4c0,142.3-241.8,264.9-241.8,264.9V203.1h241.8  C753.8,203.1,753.8,406.1,753.8,548.4z"
+	/>
+</svg>

src/lib/database/applications.ts

@@ -1,6 +1,6 @@
 import { decrypt, encrypt } from '$lib/crypto';
-import { removeProxyConfiguration } from '$lib/haproxy';
-import { asyncExecShell, getEngine, removeContainer } from '$lib/common';
+import { removeProxyConfiguration, removeWwwRedirection } from '$lib/haproxy';
+import { asyncExecShell, getEngine } from '$lib/common';
 
 import { getDomain, removeDestinationDocker } from '$lib/common';
 import { prisma } from './common';
@@ -113,6 +113,13 @@ export async function getApplicationWebhook({ projectId, branch }) {
 		throw { status: 404, body: { message: e.message } };
 	}
 }
+export async function getApplicationById({ id }) {
+	const body = await prisma.application.findFirst({
+		where: { id }
+	});
+
+	return { ...body };
+}
 export async function getApplication({ id, teamId }) {
 	let body = await prisma.application.findFirst({
 		where: { id, teams: { some: { id: teamId } } },

src/lib/database/checks.ts

@@ -1,5 +1,5 @@
 import { getDomain } from '$lib/common';
-import { prisma, PrismaErrorHandler } from './common';
+import { prisma } from './common';
 
 export async function isBranchAlreadyUsed({ repository, branch, id }) {
 	const application = await prisma.application.findUnique({

src/lib/database/common.ts

@@ -36,23 +36,36 @@ if (dev) {
 }
 export const prisma = new PrismaClient(prismaOptions);
 
-export function PrismaErrorHandler(e) {
+export function ErrorHandler(e) {
 	if (e! instanceof Error) {
 		e = new Error(e.toString());
 	}
-	sentry.captureException(e);
+	let truncatedError = e;
+	if (e.message?.includes('docker run')) {
+		let truncatedArray = [];
+		truncatedArray = truncatedError.message.split('-').filter((line) => {
+			if (!line.startsWith('e ')) {
+				return line;
+			}
+		});
+		truncatedError.message = truncatedArray.join('-');
+	}
+	if (e.message?.includes('git clone')) {
+		truncatedError.message = 'git clone failed';
+	}
+	sentry.captureException(truncatedError);
 	const payload = {
-		status: e.status || 500,
+		status: truncatedError.status || 500,
 		body: {
 			message: 'Ooops, something is not okay, are you okay?',
-			error: e.error || e.message
+			error: truncatedError.error || truncatedError.message
 		}
 	};
-	if (e.name === 'NotFoundError') {
+	if (truncatedError?.name === 'NotFoundError') {
 		payload.status = 404;
 	}
-	if (e instanceof P.PrismaClientKnownRequestError) {
-		if (e.code === 'P2002') {
+	if (truncatedError instanceof P.PrismaClientKnownRequestError) {
+		if (truncatedError?.code === 'P2002') {
 			payload.body.message = 'Already exists. Choose another name.';
 		}
 	}
@@ -116,6 +129,12 @@ export const supportedServiceTypesAndVersions = [
 		fancyName: 'Wordpress',
 		baseImage: 'wordpress',
 		versions: ['latest', 'php8.1', 'php8.0', 'php7.4', 'php7.3']
+	},
+	{
+		name: 'vaultwarden',
+		fancyName: 'Vaultwarden',
+		baseImage: 'vaultwarden/server',
+		versions: ['latest']
 	}
 ];
 

src/lib/database/databases.ts

@@ -2,7 +2,7 @@ import { decrypt, encrypt } from '$lib/crypto';
 import { dockerInstance } from '$lib/docker';
 import cuid from 'cuid';
 import { generatePassword } from '.';
-import { prisma, PrismaErrorHandler } from './common';
+import { prisma, ErrorHandler } from './common';
 import getPort from 'get-port';
 import { asyncExecShell, getEngine, removeContainer } from '$lib/common';
 
@@ -114,15 +114,6 @@ export async function updateDatabase({
 	});
 }
 
-// export async function setDatabaseSettings({ id, isPublic }) {
-//     try {
-//         await prisma.databaseSettings.update({ where: { databaseId: id }, data: { isPublic } })
-//         return { status: 201 }
-//     } catch (e) {
-//         throw PrismaErrorHandler(e)
-//     }
-// }
-
 export async function stopDatabase(database) {
 	let everStarted = false;
 	const {

src/lib/database/destinations.ts

@@ -1,8 +1,8 @@
 import { asyncExecShell, getEngine } from '$lib/common';
 import { dockerInstance } from '$lib/docker';
-import { defaultProxyImageHttp, defaultProxyImageTcp, startCoolifyProxy } from '$lib/haproxy';
+import { startCoolifyProxy } from '$lib/haproxy';
 import { getDatabaseImage } from '.';
-import { prisma, PrismaErrorHandler } from './common';
+import { prisma } from './common';
 
 export async function listDestinations(teamId) {
 	return await prisma.destinationDocker.findMany({ where: { teams: { some: { id: teamId } } } });
@@ -37,11 +37,9 @@ export async function configureDestinationForDatabase({ id, destinationId }) {
 		const host = getEngine(engine);
 		if (type && version) {
 			const baseImage = getDatabaseImage(type);
-			asyncExecShell(`DOCKER_HOST=${host} docker pull ${baseImage}:${version}`);
-			asyncExecShell(`DOCKER_HOST=${host} docker pull coollabsio/${defaultProxyImageTcp}`);
-			asyncExecShell(`DOCKER_HOST=${host} docker pull coollabsio/${defaultProxyImageHttp}`);
-			asyncExecShell(`DOCKER_HOST=${host} docker pull certbot/certbot:latest`);
-			asyncExecShell(`DOCKER_HOST=${host} docker pull alpine:latest`);
+			asyncExecShell(
+				`DOCKER_HOST=${host} docker pull ${baseImage}:${version} && echo "FROM ${baseImage}:${version}" | docker build --label coolify.managed="true" -t "${baseImage}:${version}" -`
+			);
 		}
 	}
 }
@@ -111,22 +109,4 @@ export async function setDestinationSettings({ engine, isCoolifyProxyUsed }) {
 		where: { engine },
 		data: { isCoolifyProxyUsed }
 	});
-
-	// if (isCoolifyProxyUsed) {
-	//     await installCoolifyProxy(engine)
-	//     await configureNetworkCoolifyProxy(engine)
-	// } else {
-	//     // TODO: must check if other destination is using the proxy??? or not?
-	//     const domain = await prisma.setting.findUnique({ where: { name: 'domain' }, rejectOnNotFound: false })
-	//     if (!domain) {
-	//         await uninstallCoolifyProxy(engine)
-	//     } else {
-	//         return {
-	//             stastus: 500,
-	//             body: {
-	//                 message: 'You can not disable the Coolify proxy while the domain is set for Coolify itself.'
-	//             }
-	//         }
-	//     }
-	// }
 }

src/lib/database/gitSources.ts

@@ -1,5 +1,5 @@
 import { decrypt, encrypt } from '$lib/crypto';
-import { prisma, PrismaErrorHandler } from './common';
+import { prisma } from './common';
 
 export async function listSources(teamId) {
 	return await prisma.gitSource.findMany({

src/lib/database/github.ts

@@ -1,5 +1,5 @@
 import { decrypt, encrypt } from '$lib/crypto';
-import { prisma, PrismaErrorHandler } from './common';
+import { prisma } from './common';
 
 export async function addInstallation({ gitSourceId, installation_id }) {
 	const source = await prisma.gitSource.findUnique({

src/lib/database/gitlab.ts

@@ -1,5 +1,5 @@
 import { encrypt } from '$lib/crypto';
-import { generateSshKeyPair, prisma, PrismaErrorHandler } from './common';
+import { generateSshKeyPair, prisma } from './common';
 
 export async function updateDeployKey({ id, deployKeyId }) {
 	const application = await prisma.application.findUnique({

src/lib/database/logs.ts

@@ -1,4 +1,4 @@
-import { prisma, PrismaErrorHandler } from './common';
+import { prisma, ErrorHandler } from './common';
 
 export async function listLogs({ buildId, last = 0 }) {
 	try {
@@ -7,7 +7,7 @@ export async function listLogs({ buildId, last = 0 }) {
 			orderBy: { time: 'asc' }
 		});
 		return [...body];
-	} catch (e) {
-		throw PrismaErrorHandler(e);
+	} catch (error) {
+		return ErrorHandler(error);
 	}
 }

src/lib/database/secrets.ts

@@ -1,5 +1,5 @@
 import { encrypt } from '$lib/crypto';
-import { prisma, PrismaErrorHandler } from './common';
+import { prisma } from './common';
 
 export async function listSecrets({ applicationId }) {
 	return await prisma.secret.findMany({

src/lib/database/services.ts

@@ -1,8 +1,7 @@
 import { decrypt, encrypt } from '$lib/crypto';
-import { dockerInstance } from '$lib/docker';
 import cuid from 'cuid';
 import { generatePassword } from '.';
-import { prisma, PrismaErrorHandler } from './common';
+import { prisma } from './common';
 
 export async function listServices(teamId) {
 	return await prisma.service.findMany({ where: { teams: { some: { id: teamId } } } });
@@ -99,6 +98,13 @@ export async function configureServiceType({ id, type }) {
 				wordpress: { create: { mysqlPassword, mysqlRootUserPassword, mysqlRootUser, mysqlUser } }
 			}
 		});
+	} else if (type === 'vaultwarden') {
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type
+			}
+		});
 	}
 }
 export async function setService({ id, version }) {
@@ -115,6 +121,9 @@ export async function updatePlausibleAnalyticsService({ id, fqdn, email, usernam
 export async function updateNocoDbOrMinioService({ id, fqdn, name }) {
 	return await prisma.service.update({ where: { id }, data: { fqdn, name } });
 }
+export async function updateVaultWardenService({ id, fqdn, name }) {
+	return await prisma.service.update({ where: { id }, data: { fqdn, name } });
+}
 export async function updateVsCodeServer({ id, fqdn, name }) {
 	return await prisma.service.update({ where: { id }, data: { fqdn, name } });
 }

src/lib/database/teams.ts

@@ -1,4 +1,4 @@
-import { prisma, PrismaErrorHandler } from './common';
+import { prisma } from './common';
 
 export async function listTeams() {
 	return await prisma.team.findMany();

src/lib/database/users.ts

@@ -1,8 +1,8 @@
 import cuid from 'cuid';
 import bcrypt from 'bcrypt';
 
-import { prisma, PrismaErrorHandler } from './common';
-import { asyncExecShell, removeContainer, uniqueName } from '$lib/common';
+import { prisma } from './common';
+import { asyncExecShell, uniqueName } from '$lib/common';
 
 import * as db from '$lib/database';
 import { startCoolifyProxy } from '$lib/haproxy';
@@ -28,12 +28,12 @@ export async function login({ email, password }) {
 				console.log('Network created');
 			})
 			.catch(() => {
-				console.log('Network already exists');
+				console.log('Network already exists.');
 			});
 
 		startCoolifyProxy('/var/run/docker.sock')
 			.then(() => {
-				console.log('Coolify Proxy Started');
+				console.log('Coolify Proxy started.');
 			})
 			.catch((err) => {
 				console.log(err);
@@ -97,17 +97,6 @@ export async function login({ email, password }) {
 			});
 		}
 	}
-
-	// const token = jsonwebtoken.sign({}, secretKey, {
-	//     expiresIn: 15778800,
-	//     algorithm: 'HS256',
-	//     audience: 'coolify',
-	//     issuer: 'coolify',
-	//     jwtid: uid,
-	//     subject: `User:${uid}`,
-	//     notBefore: -1000
-	// });
-
 	return {
 		status: 200,
 		headers: {

src/lib/haproxy/index.ts

@@ -1,5 +1,5 @@
 import { dev } from '$app/env';
-import { asyncExecShell, getEngine } from '$lib/common';
+import { asyncExecShell, getDomain, getEngine } from '$lib/common';
 import got from 'got';
 import * as db from '$lib/database';
 import { letsEncrypt } from '$lib/letsencrypt';
@@ -51,11 +51,11 @@ export async function completeTransaction(transactionId) {
 
 export async function removeProxyConfiguration({ domain }) {
 	const haproxy = await haproxyInstance();
-	const transactionId = await getNextTransactionId();
 	const backendFound = await haproxy
 		.get(`v2/services/haproxy/configuration/backends/${domain}`)
 		.json();
 	if (backendFound) {
+		const transactionId = await getNextTransactionId();
 		await haproxy
 			.delete(`v2/services/haproxy/configuration/backends/${domain}`, {
 				searchParams: {
@@ -65,6 +65,7 @@ export async function removeProxyConfiguration({ domain }) {
 			.json();
 		await completeTransaction(transactionId);
 	}
+	await removeWwwRedirection(domain);
 }
 export async function forceSSLOffApplication({ domain }) {
 	if (!dev) {
@@ -120,7 +121,9 @@ export async function forceSSLOnApplication({ domain }) {
 				.json();
 			let nextRule = 0;
 			if (rules.data.length > 0) {
-				const rule = rules.data.find((rule) => rule.cond_test.includes(`-i ${domain}`));
+				const rule = rules.data.find((rule) =>
+					rule.cond_test.includes(`{ hdr(host) -i ${domain} } !{ ssl_fc }`)
+				);
 				if (rule) return;
 				nextRule = rules.data[rules.data.length - 1].index + 1;
 			}
@@ -134,7 +137,7 @@ export async function forceSSLOnApplication({ domain }) {
 					json: {
 						index: nextRule,
 						cond: 'if',
-						cond_test: `{ hdr(Host) -i ${domain} } !{ ssl_fc }`,
+						cond_test: `{ hdr(host) -i ${domain} } !{ ssl_fc }`,
 						type: 'redirect',
 						redir_type: 'scheme',
 						redir_value: 'https',
@@ -155,11 +158,7 @@ export async function forceSSLOnApplication({ domain }) {
 
 export async function deleteProxy({ id }) {
 	const haproxy = await haproxyInstance();
-	try {
-		await checkHAProxy(haproxy);
-	} catch (error) {
-		return;
-	}
+	await checkHAProxy(haproxy);
 	const transactionId = await getNextTransactionId();
 	try {
 		await haproxy.get(`v2/services/haproxy/configuration/backends/${id}`).json();
@@ -184,94 +183,7 @@ export async function deleteProxy({ id }) {
 		await completeTransaction(transactionId);
 	}
 }
-// export async function configureProxyForDatabase({ id, port, isPublic, privatePort }) {
-//     const haproxy = await haproxyInstance()
-//     try {
-//         await checkHAProxy()
-//     } catch (error) {
-//         return
-//     }
 
-//     let alreadyConfigured = false
-//     try {
-//         const backend: any = await haproxy.get(`v2/services/haproxy/configuration/backends/${id}`).json()
-//         const server: any = await haproxy.get(`v2/services/haproxy/configuration/servers/${id}`, {
-//             searchParams: {
-//                 backend: id
-//             },
-//         }).json()
-//         if (backend.data.name === id) {
-//             if (server.data.port === privatePort) {
-//                 if (server.data.check === 'enabled') {
-//                     if (server.data.address === id) {
-//                         alreadyConfigured = true
-//                     }
-//                 }
-//             }
-//         }
-//     } catch (error) {
-//         console.log('error getting backend or server', error.response.body)
-//     }
-//     if (alreadyConfigured) return
-
-//     const transactionId = await getNextTransactionId()
-//     try {
-//         await haproxy.post('v2/services/haproxy/configuration/backends', {
-//             searchParams: {
-//                 transaction_id: transactionId
-//             },
-//             json: {
-//                 "init-addr": "last,libc,none",
-//                 "mode": "tcp",
-//                 "name": id
-//             }
-//         })
-//         await haproxy.post('v2/services/haproxy/configuration/servers', {
-//             searchParams: {
-//                 transaction_id: transactionId,
-//                 backend: id
-//             },
-//             json: {
-//                 "address": id,
-//                 "check": "enabled",
-//                 "name": id,
-//                 "port": privatePort
-//             }
-//         })
-//         await haproxy.post('v2/services/haproxy/configuration/frontends', {
-//             searchParams: {
-//                 transaction_id: transactionId,
-//                 backend: id
-//             },
-//             json: {
-//                 "default_backend": id,
-//                 "mode": "tcp",
-//                 "name": id
-//             }
-//         })
-//         await haproxy.post('v2/services/haproxy/configuration/binds', {
-//             searchParams: {
-//                 transaction_id: transactionId,
-//                 frontend: id
-//             },
-//             json: {
-//                 "address": "*",
-//                 "name": id,
-//                 "port": port
-//             }
-//         })
-//     } catch (error) {
-//         console.log(error.response.body)
-//         throw error.response.body
-//     } finally {
-//         try {
-//             await completeTransaction(transactionId)
-//         } catch (error) {
-//             console.log(error.response.body)
-//         }
-//     }
-//     await configureDatabaseVisibility({ id, isPublic })
-// }
 export async function reloadHaproxy(engine) {
 	const host = getEngine(engine);
 	return await asyncExecShell(`DOCKER_HOST=${host} docker exec coolify-haproxy kill -HUP 1`);
@@ -356,7 +268,8 @@ export async function configureProxyForApplication({ domain, imageId, applicatio
 	}
 }
 
-export async function configureCoolifyProxyOff({ domain }) {
+export async function configureCoolifyProxyOff(fqdn) {
+	const domain = getDomain(fqdn);
 	const haproxy = await haproxyInstance();
 	await checkHAProxy(haproxy);
 
@@ -374,19 +287,24 @@ export async function configureCoolifyProxyOff({ domain }) {
 		if (!dev) {
 			await forceSSLOffApplication({ domain });
 		}
+		await setWwwRedirection(fqdn);
 	} catch (error) {
 		throw error?.response?.body || error;
 	}
 }
-export async function checkHAProxy(haproxy) {
+export async function checkHAProxy(haproxy?: any) {
 	if (!haproxy) haproxy = await haproxyInstance();
 	try {
 		await haproxy.get('v2/info');
 	} catch (error) {
-		throw 'HAProxy is not running, but it should be!';
+		throw {
+			message:
+				'Coolify Proxy is not running, but it should be!<br><br>Start it in the "Destinations" menu.'
+		};
 	}
 }
-export async function configureCoolifyProxyOn({ domain }) {
+export async function configureCoolifyProxyOn(fqdn) {
+	const domain = getDomain(fqdn);
 	const haproxy = await haproxyInstance();
 	await checkHAProxy(haproxy);
 	let serverConfigured = false;
@@ -481,8 +399,12 @@ export async function startTcpProxy(destinationDocker, id, publicPort, privatePo
 
 	try {
 		if (foundDB && !found) {
+			const { stdout: Config } = await asyncExecShell(
+				`DOCKER_HOST="${host}" docker network inspect bridge --format '{{json .IPAM.Config }}'`
+			);
+			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' --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} -d coollabsio/${defaultProxyImageTcp}`
 			);
 		}
 	} catch (error) {
@@ -499,8 +421,12 @@ export async function startHttpProxy(destinationDocker, id, publicPort, privateP
 
 	try {
 		if (foundDB && !found) {
+			const { stdout: Config } = await asyncExecShell(
+				`DOCKER_HOST="${host}" docker network inspect bridge --format '{{json .IPAM.Config }}'`
+			);
+			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' --network ${network} -p ${publicPort}:${publicPort} --name ${containerName} -d coollabsio/${defaultProxyImageHttp}`
+				`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/${defaultProxyImageHttp}`
 			);
 		}
 	} catch (error) {
@@ -512,8 +438,12 @@ export async function startCoolifyProxy(engine) {
 	const found = await checkContainer(engine, 'coolify-haproxy');
 	const { proxyPassword, proxyUser } = await db.listSettings();
 	if (!found) {
+		const { stdout: Config } = await asyncExecShell(
+			`DOCKER_HOST="${host}" docker network inspect bridge --format '{{json .IPAM.Config }}'`
+		);
+		const ip = JSON.parse(Config)[0].Gateway;
 		await asyncExecShell(
-			`DOCKER_HOST="${host}" docker run -e HAPROXY_USERNAME=${proxyUser} -e HAPROXY_PASSWORD=${proxyPassword} --restart always --add-host 'host.docker.internal:host-gateway' -v coolify-ssl-certs:/usr/local/etc/haproxy/ssl --network coolify-infra -p "80:80" -p "443:443" -p "8404:8404" -p "5555:5555" -p "5000:5000" --name coolify-haproxy -d coollabsio/${defaultProxyImage}`
+			`DOCKER_HOST="${host}" docker run -e HAPROXY_USERNAME=${proxyUser} -e HAPROXY_PASSWORD=${proxyPassword} --restart always --add-host 'host.docker.internal:host-gateway' --add-host 'host.docker.internal:${ip}' -v coolify-ssl-certs:/usr/local/etc/haproxy/ssl --network coolify-infra -p "80:80" -p "443:443" -p "8404:8404" -p "5555:5555" -p "5000:5000" --name coolify-haproxy -d coollabsio/${defaultProxyImage}`
 		);
 	}
 	await configureNetworkCoolifyProxy(engine);
@@ -574,14 +504,18 @@ export async function configureNetworkCoolifyProxy(engine) {
 
 export async function configureSimpleServiceProxyOn({ id, domain, port }) {
 	const haproxy = await haproxyInstance();
-	try {
-		await checkHAProxy(haproxy);
-	} catch (error) {
-		return;
-	}
+	await checkHAProxy(haproxy);
 	try {
 		await haproxy.get(`v2/services/haproxy/configuration/backends/${domain}`).json();
-		return;
+		const transactionId = await getNextTransactionId();
+		await haproxy
+			.delete(`v2/services/haproxy/configuration/backends/${domain}`, {
+				searchParams: {
+					transaction_id: transactionId
+				}
+			})
+			.json();
+		await completeTransaction(transactionId);
 	} catch (error) {}
 	try {
 		const transactionId = await getNextTransactionId();
@@ -607,6 +541,12 @@ export async function configureSimpleServiceProxyOn({ id, domain, port }) {
 				port: port
 			}
 		});
+		console.log({
+			address: id,
+			check: 'enabled',
+			name: id,
+			port: port
+		});
 		await completeTransaction(transactionId);
 	} catch (error) {
 		console.log(error);
@@ -616,11 +556,9 @@ export async function configureSimpleServiceProxyOn({ id, domain, port }) {
 export async function configureSimpleServiceProxyOff({ domain }) {
 	const haproxy = await haproxyInstance();
 	await checkHAProxy(haproxy);
-
 	try {
 		await haproxy.get(`v2/services/haproxy/configuration/backends/${domain}`).json();
 		const transactionId = await getNextTransactionId();
-
 		await haproxy
 			.delete(`v2/services/haproxy/configuration/backends/${domain}`, {
 				searchParams: {
@@ -630,5 +568,89 @@ export async function configureSimpleServiceProxyOff({ domain }) {
 			.json();
 		await completeTransaction(transactionId);
 	} catch (error) {}
+	await removeWwwRedirection(domain);
 	return;
 }
+
+export async function removeWwwRedirection(domain) {
+	const haproxy = await haproxyInstance();
+	await checkHAProxy();
+	const rules: any = await haproxy
+		.get(`v2/services/haproxy/configuration/http_request_rules`, {
+			searchParams: {
+				parent_name: 'http',
+				parent_type: 'frontend'
+			}
+		})
+		.json();
+	if (rules.data.length > 0) {
+		const rule = rules.data.find((rule) =>
+			rule.redir_value.includes(`${domain}%[capture.req.uri]`)
+		);
+		if (rule) {
+			const transactionId = await getNextTransactionId();
+			await haproxy
+				.delete(`v2/services/haproxy/configuration/http_request_rules/${rule.index}`, {
+					searchParams: {
+						transaction_id: transactionId,
+						parent_name: 'http',
+						parent_type: 'frontend'
+					}
+				})
+				.json();
+			await completeTransaction(transactionId);
+		}
+	}
+}
+export async function setWwwRedirection(fqdn) {
+	const haproxy = await haproxyInstance();
+	await checkHAProxy(haproxy);
+	const transactionId = await getNextTransactionId();
+
+	try {
+		const domain = getDomain(fqdn);
+		const isHttps = fqdn.startsWith('https://');
+		const isWWW = fqdn.includes('www.');
+		const contTest = `{ req.hdr(host) -i ${isWWW ? domain.replace('www.', '') : `www.${domain}`} }`;
+		const rules: any = await haproxy
+			.get(`v2/services/haproxy/configuration/http_request_rules`, {
+				searchParams: {
+					parent_name: 'http',
+					parent_type: 'frontend'
+				}
+			})
+			.json();
+		let nextRule = 0;
+		if (rules.data.length > 0) {
+			const rule = rules.data.find((rule) =>
+				rule.redir_value.includes(`${domain}%[capture.req.uri]`)
+			);
+			if (rule) return;
+			nextRule = rules.data[rules.data.length - 1].index + 1;
+		}
+		const redirectValue = `${isHttps ? 'https://' : 'http://'}${domain}%[capture.req.uri]`;
+		await haproxy
+			.post(`v2/services/haproxy/configuration/http_request_rules`, {
+				searchParams: {
+					transaction_id: transactionId,
+					parent_name: 'http',
+					parent_type: 'frontend'
+				},
+				json: {
+					index: nextRule,
+					cond: 'if',
+					cond_test: contTest,
+					type: 'redirect',
+					redir_type: 'location',
+					redir_value: redirectValue,
+					redir_code: dev ? 302 : 301
+				}
+			})
+			.json();
+	} catch (error) {
+		console.log(error);
+		throw error;
+	} finally {
+		await completeTransaction(transactionId);
+	}
+}

src/lib/importers/github.ts

@@ -2,7 +2,7 @@ import { asyncExecShell, saveBuildLog } from '$lib/common';
 import got from 'got';
 import jsonwebtoken from 'jsonwebtoken';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 
 export default async function ({
 	applicationId,
@@ -45,6 +45,6 @@ export default async function ({
 		const { stdout: commit } = await asyncExecShell(`cd ${workdir}/ && git rev-parse HEAD`);
 		return commit.replace('\n', '');
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 }

src/lib/importers/gitlab.ts

@@ -1,5 +1,5 @@
 import { asyncExecShell, saveBuildLog } from '$lib/common';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 
 export default async function ({
 	applicationId,

src/lib/letsencrypt.ts

@@ -2,15 +2,17 @@ import { dev } from '$app/env';
 import { forceSSLOffApplication, forceSSLOnApplication, getNextTransactionId } from '$lib/haproxy';
 import { asyncExecShell, getEngine } from './common';
 import * as db from '$lib/database';
+import cuid from 'cuid';
 
 export async function letsEncrypt({ domain, isCoolify = false, id = null }) {
 	try {
+		const randomCuid = cuid();
 		if (dev) {
 			return await forceSSLOnApplication({ domain });
 		} else {
 			if (isCoolify) {
 				await asyncExecShell(
-					`docker run --rm --name certbot -p 9080:9080 -v "coolify-letsencrypt:/etc/letsencrypt" certbot/certbot --logs-dir /etc/letsencrypt/logs certonly --standalone --preferred-challenges http --http-01-address 0.0.0.0 --http-01-port 9080 -d ${domain} --agree-tos --non-interactive --register-unsafely-without-email`
+					`docker run --rm --name certbot-${randomCuid} -p 9080:9080 -v "coolify-letsencrypt:/etc/letsencrypt" certbot/certbot --logs-dir /etc/letsencrypt/logs certonly --standalone --preferred-challenges http --http-01-address 0.0.0.0 --http-01-port 9080 -d ${domain} --agree-tos --non-interactive --register-unsafely-without-email`
 				);
 
 				const { stderr } = await asyncExecShell(
@@ -33,10 +35,10 @@ export async function letsEncrypt({ domain, isCoolify = false, id = null }) {
 			if (data.destinationDockerId && data.destinationDocker) {
 				const host = getEngine(data.destinationDocker.engine);
 				await asyncExecShell(
-					`DOCKER_HOST=${host} docker run --rm --name certbot -p 9080:9080 -v "coolify-letsencrypt:/etc/letsencrypt" certbot/certbot --logs-dir /etc/letsencrypt/logs certonly --standalone --preferred-challenges http --http-01-address 0.0.0.0 --http-01-port 9080 -d ${domain} --agree-tos --non-interactive --register-unsafely-without-email`
+					`DOCKER_HOST=${host} docker run --rm --name certbot-${randomCuid} -p 9080:9080 -v "coolify-letsencrypt:/etc/letsencrypt" certbot/certbot --logs-dir /etc/letsencrypt/logs certonly --standalone --preferred-challenges http --http-01-address 0.0.0.0 --http-01-port 9080 -d ${domain} --agree-tos --non-interactive --register-unsafely-without-email`
 				);
 				const { stderr } = await asyncExecShell(
-					`DOCKER_HOST=${host} docker run --rm --name bash -v "coolify-letsencrypt:/etc/letsencrypt" -v "coolify-ssl-certs:/app/ssl" alpine:latest cat /etc/letsencrypt/live/${domain}/fullchain.pem /etc/letsencrypt/live/${domain}/privkey.pem > /app/ssl/${domain}.pem`
+					`DOCKER_HOST=${host} docker run --rm --name bash-${randomCuid} -v "coolify-letsencrypt:/etc/letsencrypt" -v "coolify-ssl-certs:/app/ssl" alpine:latest cat /etc/letsencrypt/live/${domain}/fullchain.pem /etc/letsencrypt/live/${domain}/privkey.pem > /app/ssl/${domain}.pem`
 				);
 				if (stderr) throw new Error(stderr);
 				await forceSSLOnApplication({ domain });

src/lib/queues/builder.ts

@@ -4,9 +4,10 @@ import * as buildpacks from '../buildPacks';
 import * as importers from '../importers';
 import { dockerInstance } from '../docker';
 import { asyncExecShell, createDirectories, getDomain, getEngine, saveBuildLog } from '../common';
-import { configureProxyForApplication, reloadHaproxy } from '../haproxy';
+import { configureProxyForApplication, reloadHaproxy, setWwwRedirection } from '../haproxy';
 import * as db from '$lib/database';
 import { decrypt } from '$lib/crypto';
+import { sentry } from '$lib/common';
 import {
 	copyBaseConfigurationFiles,
 	makeLabelForStandaloneApplication,
@@ -63,10 +64,6 @@ export default async function (job) {
 	if (destinationDockerId) {
 		destinationType = 'docker';
 	}
-	// Not implemented yet
-	// if (destinationKubernetesId) {
-	//   destinationType = 'kubernetes'
-	// }
 
 	if (destinationType === 'docker') {
 		const docker = dockerInstance({ destinationDocker });
@@ -208,9 +205,7 @@ export default async function (job) {
 		const envs = [];
 		if (secrets.length > 0) {
 			secrets.forEach((secret) => {
-				if (!secret.isBuildSecret) {
-					envs.push(`${secret.name}=${secret.value}`);
-				}
+				envs.push(`${secret.name}=${secret.value}`);
 			});
 		}
 		await fs.writeFile(`${workdir}/.env`, envs.join('\n'));
@@ -246,19 +241,23 @@ export default async function (job) {
 		} catch (error) {
 			throw new Error(error);
 		}
-
-		if (destinationDockerId && destinationDocker.isCoolifyProxyUsed) {
-			saveBuildLog({ line: 'Proxy configuration started!', buildId, applicationId });
-			await configureProxyForApplication({ domain, imageId, applicationId, port });
-			if (isHttps) await letsEncrypt({ domain, id: applicationId });
-			await reloadHaproxy(destinationDocker.engine);
-			saveBuildLog({ line: 'Proxy configuration successful!', buildId, applicationId });
-		} else {
-			saveBuildLog({
-				line: 'Coolify Proxy is not configured for this destination. Nothing else to do.',
-				buildId,
-				applicationId
-			});
+		try {
+			if (destinationDockerId && destinationDocker.isCoolifyProxyUsed) {
+				saveBuildLog({ line: 'Proxy configuration started!', buildId, applicationId });
+				await configureProxyForApplication({ domain, imageId, applicationId, port });
+				if (isHttps) await letsEncrypt({ domain, id: applicationId });
+				await setWwwRedirection(fqdn);
+				await reloadHaproxy(destinationDocker.engine);
+				saveBuildLog({ line: 'Proxy configuration successful!', buildId, applicationId });
+			} else {
+				saveBuildLog({
+					line: 'Coolify Proxy is not configured for this destination. Nothing else to do.',
+					buildId,
+					applicationId
+				});
+			}
+		} catch (error) {
+			sentry.captureException(error);
 		}
 	}
 }

src/lib/queues/cleanup.ts

@@ -1,22 +1,43 @@
 import { dev } from '$app/env';
 import { asyncExecShell, getEngine } from '$lib/common';
 import { prisma } from '$lib/database';
+import { defaultProxyImageHttp, defaultProxyImageTcp } from '$lib/haproxy';
 
 export default async function () {
 	if (!dev) {
 		const destinationDockers = await prisma.destinationDocker.findMany();
 		for (const destinationDocker of destinationDockers) {
 			const host = getEngine(destinationDocker.engine);
+			// Tagging images with labels
+			try {
+				const images = [
+					`coollabsio/${defaultProxyImageTcp}`,
+					`coollabsio/${defaultProxyImageHttp}`,
+					'certbot/certbot:latest',
+					'node:16.14.0-alpine',
+					'alpine:latest',
+					'nginx:stable-alpine',
+					'node:lts',
+					'php:apache',
+					'rust:latest'
+				];
+				for (const image of images) {
+					await asyncExecShell(
+						`DOCKER_HOST=${host} docker pull ${image} && echo "FROM ${image}" | docker build --label coolify.managed="true" -t "${image}" -`
+					);
+				}
+			} catch (error) {}
 			try {
 				await asyncExecShell(`DOCKER_HOST=${host} docker container prune -f`);
 			} catch (error) {
-				//
 				console.log(error);
 			}
+			// Cleanup images that are not managed by coolify
 			try {
-				await asyncExecShell(`DOCKER_HOST=${host} docker image prune -f`);
+				await asyncExecShell(
+					`DOCKER_HOST=${host} docker image prune --filter 'label!=coolify.managed=true' -a -f`
+				);
 			} catch (error) {
-				//
 				console.log(error);
 			}
 		}

src/lib/queues/index.ts

@@ -107,7 +107,7 @@ cron().catch((error) => {
 	console.log(error);
 });
 
-const buildQueueName = dev ? cuid() : 'build_queue';
+const buildQueueName = 'build_queue';
 const buildQueue = new Queue(buildQueueName, connectionOptions);
 const buildWorker = new Worker(buildQueueName, async (job) => await builder(job), {
 	concurrency: 2,
@@ -120,11 +120,8 @@ buildWorker.on('completed', async (job: Bullmq.Job) => {
 	} catch (err) {
 		console.log(err);
 	} finally {
-		const workdir = `/tmp/build-sources/${job.data.repository}/${job.data.build_id}`;
+		const workdir = `/tmp/build-sources/${job.data.repository}/`;
 		await asyncExecShell(`rm -fr ${workdir}`);
-		await asyncExecShell(
-			`test -f /tmp/build-sources/${job.data.repository}/id.rsa && rm /tmp/build-sources/${job.data.repository}/id.rsa`
-		);
 	}
 	return;
 });
@@ -136,11 +133,8 @@ buildWorker.on('failed', async (job: Bullmq.Job, failedReason) => {
 	} catch (error) {
 		console.log(error);
 	} finally {
-		const workdir = `/tmp/build-sources/${job.data.repository}/${job.data.build_id}`;
+		const workdir = `/tmp/build-sources/${job.data.repository}`;
 		await asyncExecShell(`rm -fr ${workdir}`);
-		await asyncExecShell(
-			`test -f /tmp/build-sources/${job.data.repository}/id.rsa && rm /tmp/build-sources/${job.data.repository}/id.rsa`
-		);
 	}
 	saveBuildLog({ line: 'Failed build!', buildId: job.data.build_id, applicationId: job.data.id });
 	saveBuildLog({
@@ -150,28 +144,6 @@ buildWorker.on('failed', async (job: Bullmq.Job, failedReason) => {
 	});
 });
 
-// const letsEncryptQueueName = dev ? cuid() : 'letsencrypt_queue'
-// const letsEncryptQueue = new Queue(letsEncryptQueueName, connectionOptions)
-
-// const letsEncryptWorker = new Worker(letsEncryptQueueName, async (job) => await letsencrypt(job), {
-//   concurrency: 1,
-//   ...connectionOptions
-// })
-// letsEncryptWorker.on('completed', async () => {
-//   // TODO: Save letsencrypt logs as build logs!
-//   console.log('[DEBUG] Lets Encrypt job completed')
-// })
-
-// letsEncryptWorker.on('failed', async (job: Job, failedReason: string) => {
-//   try {
-//     await prisma.applicationSettings.updateMany({ where: { applicationId: job.data.id }, data: { forceSSL: false } })
-//   } catch (error) {
-//     console.log(error)
-//   }
-//   console.log('[DEBUG] Lets Encrypt job failed')
-//   console.log(failedReason)
-// })
-
 const buildLogQueueName = dev ? cuid() : 'log_queue';
 const buildLogQueue = new Queue(buildLogQueueName, connectionOptions);
 const buildLogWorker = new Worker(buildLogQueueName, async (job) => await logger(job), {

src/lib/queues/proxy.ts

@@ -1,5 +1,5 @@
 import { getDomain } from '$lib/common';
-import { prisma } from '$lib/database';
+import { getApplicationById, prisma } from '$lib/database';
 import { dockerInstance } from '$lib/docker';
 import {
 	checkContainer,
@@ -7,6 +7,7 @@ import {
 	configureProxyForApplication,
 	forceSSLOnApplication,
 	reloadHaproxy,
+	setWwwRedirection,
 	startCoolifyProxy
 } from '$lib/haproxy';
 import * as db from '$lib/database';
@@ -29,17 +30,21 @@ export default async function () {
 					if (configuration.Labels['coolify.type'] === 'standalone-application') {
 						const { fqdn, applicationId, port, pullmergeRequestId } = parsedConfiguration;
 						if (fqdn) {
-							const domain = getDomain(fqdn);
-							await configureProxyForApplication({
-								domain,
-								imageId: pullmergeRequestId
-									? `${applicationId}-${pullmergeRequestId}`
-									: applicationId,
-								applicationId,
-								port
-							});
-							const isHttps = fqdn.startsWith('https://');
-							if (isHttps) await forceSSLOnApplication({ domain });
+							const found = await getApplicationById({ id: applicationId });
+							if (found) {
+								const domain = getDomain(fqdn);
+								await configureProxyForApplication({
+									domain,
+									imageId: pullmergeRequestId
+										? `${applicationId}-${pullmergeRequestId}`
+										: applicationId,
+									applicationId,
+									port
+								});
+								const isHttps = fqdn.startsWith('https://');
+								if (isHttps) await forceSSLOnApplication({ domain });
+								await setWwwRedirection(fqdn);
+							}
 						}
 					}
 				}
@@ -52,6 +57,7 @@ export default async function () {
 			const found = await checkContainer('/var/run/docker.sock', 'coolify-haproxy');
 			if (!found) await startCoolifyProxy('/var/run/docker.sock');
 			await configureCoolifyProxyOn({ domain });
+			await setWwwRedirection(fqdn);
 			const isHttps = fqdn.startsWith('https://');
 			if (isHttps) await forceSSLOnApplication({ domain });
 		}

src/routes/__layout.svelte

@@ -39,8 +39,7 @@
 	import { errorNotification } from '$lib/form';
 	import { asyncSleep } from '$lib/components/common';
 	import { del, get, post } from '$lib/api';
-	import { dev } from '$app/env';
-	import Loading from '$lib/components/Loading.svelte';
+	import { browser } from '$app/env';
 
 	let isUpdateAvailable = false;
 	let updateStatus = {
@@ -48,9 +47,10 @@
 		checking: false,
 		success: null
 	};
-
+	let latestVersion = 'latest';
 	onMount(async () => {
 		if ($session.uid) {
+			const overrideVersion = browser && window.localStorage.getItem('latestVersion');
 			try {
 				await get(`/login.json`);
 			} catch ({ error }) {
@@ -62,10 +62,11 @@
 				updateStatus.checking = true;
 				try {
 					const data = await get(`/update.json`);
-					if (data?.isUpdateAvailable) {
-						await post(`/update.json`, { type: 'pull' });
+					if (overrideVersion || data?.isUpdateAvailable) {
+						latestVersion = overrideVersion || data.latestVersion;
+						isUpdateAvailable = overrideVersion ? true : data?.isUpdateAvailable;
+						await post(`/update.json`, { type: 'pull', latestVersion });
 					}
-					isUpdateAvailable = data?.isUpdateAvailable;
 				} catch (error) {
 				} finally {
 					updateStatus.checking = false;
@@ -95,53 +96,33 @@
 
 	async function update() {
 		updateStatus.loading = true;
-		if (!dev) {
-			try {
-				await post(`/update.json`, { type: 'update' });
-				toast.push('Update completed. Waiting for the new version to start...');
-				let reachable = false;
-				let tries = 0;
-				do {
-					await asyncSleep(4000);
-					try {
-						await get(`/undead.json`);
-						reachable = true;
-					} catch (error) {
-						reachable = false;
-					}
-					if (reachable) break;
-					tries++;
-				} while (!reachable || tries < 120);
-				toast.push('New version reachable. Reloading...');
-				updateStatus.loading = false;
-				updateStatus.success = true;
-				await asyncSleep(3000);
-				return window.location.reload();
-			} catch ({ error }) {
-				return errorNotification(error);
-			} finally {
-				updateStatus.success = false;
-				updateStatus.loading = false;
-			}
-		} else {
+		// if (!dev) {
+		try {
+			await post(`/update.json`, { type: 'update', latestVersion });
+			toast.push('Update completed. Waiting for the new version to start...');
 			let reachable = false;
 			let tries = 0;
 			do {
-				await asyncSleep(1000);
+				await asyncSleep(4000);
 				try {
 					await get(`/undead.json`);
 					reachable = true;
 				} catch (error) {
-					console.log(error);
 					reachable = false;
 				}
-				console.log(reachable);
 				if (reachable) break;
 				tries++;
 			} while (!reachable || tries < 120);
 			toast.push('New version reachable. Reloading...');
-			await asyncSleep(2000);
-			window.location.reload();
+			updateStatus.loading = false;
+			updateStatus.success = true;
+			await asyncSleep(3000);
+			return window.location.reload();
+		} catch ({ error }) {
+			return errorNotification(error);
+		} finally {
+			updateStatus.success = false;
+			updateStatus.loading = false;
 		}
 	}
 </script>

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

@@ -1,6 +1,6 @@
 import { asyncExecShell, getDomain, getEngine, getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -23,6 +23,6 @@ export const post: RequestHandler = async (event) => {
 			status: 200
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/applications/[id]/configuration/_GithubRepositories.svelte

@@ -74,13 +74,18 @@
 	}
 	async function isBranchAlreadyUsed() {
 		try {
-			return await get(
+			const data = await get(
 				`/applications/${id}/configuration/repository.json?repository=${selected.repository}&branch=${selected.branch}`
 			);
-		} catch ({ error }) {
-			return errorNotification(error);
-		} finally {
+			if (data.used) {
+				errorNotification('This branch is already used by another application.');
+				showSave = false;
+				return true;
+			}
 			showSave = true;
+		} catch ({ error }) {
+			showSave = false;
+			return errorNotification(error);
 		}
 	}
 

src/routes/applications/[id]/configuration/_GitlabRepositories.svelte

@@ -132,24 +132,20 @@
 	}
 
 	async function isBranchAlreadyUsed() {
-		const url = `/applications/${id}/configuration/repository.json?repository=${selected.project.path_with_namespace}&branch=${selected.branch.name}`;
-
 		try {
-			await get(url);
+			const data = await get(
+				`/applications/${id}/configuration/repository.json?repository=${selected.project.path_with_namespace}&branch=${selected.branch.name}`
+			);
+			if (data.used) {
+				errorNotification('This branch is already used by another application.');
+				showSave = false;
+				return true;
+			}
 			showSave = true;
-		} catch (error) {
-			showSave = false;
-			return errorNotification('Branch already configured');
+		} catch ({ error }) {
+			return errorNotification(error);
 		}
 	}
-	// async function saveDeployKey(deployKeyId: number) {
-	// 	try {
-	// 		await post(updateDeployKeyIdUrl, { deployKeyId });
-	// 	} catch (error) {
-	// 		errorNotification(error);
-	// 		throw new Error(error);
-	// 	}
-	// }
 	async function checkSSHKey(sshkeyUrl) {
 		try {
 			return await post(sshkeyUrl, {});
@@ -203,7 +199,6 @@
 			const deployKeyFound = deployKeys.filter((dk) => dk.title === `${appId}-coolify-deploy-key`);
 			if (deployKeyFound.length > 0) {
 				for (const deployKey of deployKeyFound) {
-					console.log(`${deployKeyUrl}/${deployKey.id}`);
 					await del(
 						`${deployKeyUrl}/${deployKey.id}`,
 						{},

src/routes/applications/[id]/configuration/buildpack.json.ts

@@ -1,7 +1,7 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 
 export const get: RequestHandler = async (event) => {
 	const { teamId, status, body } = await getUserDetails(event);
@@ -21,7 +21,7 @@ export const get: RequestHandler = async (event) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };
 
@@ -36,6 +36,6 @@ export const post: RequestHandler = async (event) => {
 		await db.configureBuildPack({ id, buildPack });
 		return { status: 201 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/applications/[id]/configuration/deploykey.json.ts

@@ -1,5 +1,5 @@
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -12,6 +12,6 @@ export const post: RequestHandler = async (event) => {
 		await db.updateDeployKey({ id, deployKeyId });
 		return { status: 201 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/applications/[id]/configuration/destination.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -14,6 +14,6 @@ export const post: RequestHandler = async (event) => {
 		await db.configureDestinationForApplication({ id, destinationId });
 		return { status: 201 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/applications/[id]/configuration/repository.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const get: RequestHandler = async (event) => {
@@ -14,16 +14,14 @@ export const get: RequestHandler = async (event) => {
 
 	try {
 		const found = await db.isBranchAlreadyUsed({ repository, branch, id });
-		if (found) {
-			throw {
-				error: `Branch ${branch} is already used by another application`
-			};
-		}
 		return {
-			status: 200
+			status: 200,
+			body: {
+				used: found ? true : false
+			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };
 
@@ -42,6 +40,6 @@ export const post: RequestHandler = async (event) => {
 		await db.configureGitRepository({ id, repository, branch, projectId, webhookToken });
 		return { status: 201 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/applications/[id]/configuration/source.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -13,6 +13,6 @@ export const post: RequestHandler = async (event) => {
 		await db.configureGitsource({ id, gitSourceId });
 		return { status: 201 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/applications/[id]/configuration/sshkey.json.ts

@@ -1,5 +1,5 @@
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const get: RequestHandler = async (event) => {
@@ -7,7 +7,7 @@ export const get: RequestHandler = async (event) => {
 	try {
 		return await db.getSshKey({ id });
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };
 export const post: RequestHandler = async (event) => {
@@ -15,6 +15,6 @@ export const post: RequestHandler = async (event) => {
 	try {
 		return await db.generateSshKey({ id });
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

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

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const del: RequestHandler = async (event) => {
@@ -14,6 +14,6 @@ export const del: RequestHandler = async (event) => {
 			status: 200
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

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

@@ -4,7 +4,7 @@ import cuid from 'cuid';
 import crypto from 'crypto';
 import { buildQueue } from '$lib/queues';
 import { getUserDetails } from '$lib/common';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 
 export const post: RequestHandler = async (event) => {
 	const { teamId, status, body } = await getUserDetails(event);
@@ -37,6 +37,6 @@ export const post: RequestHandler = async (event) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

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

@@ -1,7 +1,7 @@
 import { getTeam, getUserDetails } from '$lib/common';
 import { getGithubToken } from '$lib/components/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import { checkContainer } from '$lib/haproxy';
 import type { RequestHandler } from '@sveltejs/kit';
 import jsonwebtoken from 'jsonwebtoken';
@@ -44,7 +44,7 @@ export const get: RequestHandler = async (event) => {
 		};
 	} catch (error) {
 		console.log(error);
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };
 
@@ -82,6 +82,6 @@ export const post: RequestHandler = async (event) => {
 		});
 		return { status: 201 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

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

@@ -266,7 +266,7 @@
 						required
 					/>
 					<Explainer
-						text="If you specify <span class='text-green-600 font-bold'>https</span>, the application will be accessible only over https. SSL certificate will be generated for you.<br>To modify the domain, you must first stop the application."
+						text="If you specify <span class='text-green-600 font-bold'>https</span>, the application will be accessible only over https. SSL certificate will be generated for you.<br>If you specify <span class='text-green-600 font-bold'>www</span>, the application will be redirected (302) from non-www and vice versa.<br><br>To modify the domain, you must first stop the application."
 					/>
 				</div>
 			</div>

src/routes/applications/[id]/logs/build/build.json.ts

@@ -1,6 +1,6 @@
 import { getTeam, getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const get: RequestHandler = async (event) => {
@@ -23,6 +23,6 @@ export const get: RequestHandler = async (event) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/applications/[id]/logs/build/index.json.ts

@@ -1,5 +1,5 @@
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import { dayjs } from '$lib/dayjs';
 import type { RequestHandler } from '@sveltejs/kit';
 
@@ -35,6 +35,6 @@ export const get: RequestHandler = async (event) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/applications/[id]/logs/index.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import { dayjs } from '$lib/dayjs';
 import { dockerInstance } from '$lib/docker';
 import type { RequestHandler } from '@sveltejs/kit';
@@ -48,6 +48,6 @@ export const get: RequestHandler = async (event) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/applications/[id]/previews/index.json.ts

@@ -1,6 +1,6 @@
 import { getTeam, getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import { dockerInstance } from '$lib/docker';
 import type { RequestHandler } from '@sveltejs/kit';
 import jsonwebtoken from 'jsonwebtoken';
@@ -39,6 +39,6 @@ export const get: RequestHandler = async (event) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/applications/[id]/secrets/_Secret.svelte

@@ -6,22 +6,43 @@
 	import { page } from '$app/stores';
 	import { del, post } from '$lib/api';
 	import { errorNotification } from '$lib/form';
+	import { createEventDispatcher } from 'svelte';
 
-	if (name) value = 'ENCRYPTED';
+	const dispatch = createEventDispatcher();
+	let nameEl;
+	let valueEl;
 	const { id } = $page.params;
-
 	async function removeSecret() {
 		try {
 			await del(`/applications/${id}/secrets.json`, { name });
-			return window.location.reload();
+			dispatch('refresh');
+			if (isNewSecret) {
+				name = '';
+				value = '';
+				isBuildSecret = false;
+			}
 		} catch ({ error }) {
 			return errorNotification(error);
 		}
 	}
 	async function saveSecret() {
+		const nameValid = nameEl.checkValidity();
+		const valueValid = valueEl.checkValidity();
+		if (!nameValid) {
+			return nameEl.reportValidity();
+		}
+		if (!valueValid) {
+			return valueEl.reportValidity();
+		}
+
 		try {
 			await post(`/applications/${id}/secrets.json`, { name, value, isBuildSecret });
-			return window.location.reload();
+			dispatch('refresh');
+			if (isNewSecret) {
+				name = '';
+				value = '';
+				isBuildSecret = false;
+			}
 		} catch ({ error }) {
 			return errorNotification(error);
 		}
@@ -33,101 +54,89 @@
 	}
 </script>
 
-<div class="mx-auto max-w-3xl pt-4">
-	<div class="flex space-x-2">
-		<div class="grid grid-flow-row">
-			<label for="secretName">Name</label>
-			<input
-				id="secretName"
-				bind:value={name}
-				placeholder="EXAMPLE_VARIABLE"
-				class="w-64 border-2 border-transparent"
-				readonly={!isNewSecret}
-				class:hover:bg-coolgray-200={!isNewSecret}
-				class:cursor-not-allowed={!isNewSecret}
-			/>
-		</div>
-		<div class="grid grid-flow-row">
-			<label for="secretValue">Value (will be encrypted)</label>
-			<input
-				id="secretValue"
-				bind:value
-				placeholder="J$#@UIO%HO#$U%H"
-				class="w-64 border-2 border-transparent"
-				class:hover:bg-coolgray-200={!isNewSecret}
-				class:cursor-not-allowed={!isNewSecret}
-				readonly={!isNewSecret}
-			/>
-		</div>
-
-		<div class="w-32 px-2 text-center">
-			<div class="text-xs">Is build variable?</div>
-
-			<div class="mt-2">
-				<ul class="divide-y divide-stone-800">
-					<li>
-						<div
-							type="button"
-							on:click={setSecretValue}
-							aria-pressed="false"
-							class="relative inline-flex h-6 w-11 flex-shrink-0 rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out"
-							class:bg-green-600={isBuildSecret}
-							class:bg-stone-700={!isBuildSecret}
-							class:cursor-not-allowed={!isNewSecret}
-							class:cursor-pointer={isNewSecret}
-						>
-							<span class="sr-only">Use isBuildSecret</span>
-							<span
-								class="pointer-events-none relative inline-block h-5 w-5 transform rounded-full bg-white shadow transition duration-200 ease-in-out"
-								class:translate-x-5={isBuildSecret}
-								class:translate-x-0={!isBuildSecret}
-							>
-								<span
-									class=" absolute inset-0 flex h-full w-full items-center justify-center transition-opacity duration-200 ease-in"
-									class:opacity-0={isBuildSecret}
-									class:opacity-100={!isBuildSecret}
-									aria-hidden="true"
-								>
-									<svg class="h-3 w-3 bg-white text-red-600" fill="none" viewBox="0 0 12 12">
-										<path
-											d="M4 8l2-2m0 0l2-2M6 6L4 4m2 2l2 2"
-											stroke="currentColor"
-											stroke-width="2"
-											stroke-linecap="round"
-											stroke-linejoin="round"
-										/>
-									</svg>
-								</span>
-								<span
-									class="absolute inset-0 flex h-full w-full items-center justify-center transition-opacity duration-100 ease-out"
-									aria-hidden="true"
-									class:opacity-100={isBuildSecret}
-									class:opacity-0={!isBuildSecret}
-								>
-									<svg
-										class="h-3 w-3 bg-white text-green-600"
-										fill="currentColor"
-										viewBox="0 0 12 12"
-									>
-										<path
-											d="M3.707 5.293a1 1 0 00-1.414 1.414l1.414-1.414zM5 8l-.707.707a1 1 0 001.414 0L5 8zm4.707-3.293a1 1 0 00-1.414-1.414l1.414 1.414zm-7.414 2l2 2 1.414-1.414-2-2-1.414 1.414zm3.414 2l4-4-1.414-1.414-4 4 1.414 1.414z"
-										/>
-									</svg>
-								</span>
-							</span>
-						</div>
-					</li>
-				</ul>
-			</div>
-		</div>
-		{#if isNewSecret}
-			<div class="mt-6">
-				<button class="w-20 bg-green-600 hover:bg-green-500" on:click={saveSecret}>Add</button>
-			</div>
-		{:else}
-			<div class="mt-6">
-				<button class="w-20 bg-red-600 hover:bg-red-500" on:click={removeSecret}>Remove</button>
-			</div>
-		{/if}
+<td class="whitespace-nowrap px-6 py-2 text-sm font-medium text-white">
+	<input
+		id="secretName"
+		bind:this={nameEl}
+		bind:value={name}
+		required
+		placeholder="EXAMPLE_VARIABLE"
+		class="-mx-2 w-64 border-2 border-transparent"
+		readonly={!isNewSecret}
+		class:bg-transparent={!isNewSecret}
+		class:cursor-not-allowed={!isNewSecret}
+	/>
+</td>
+<td class="whitespace-nowrap px-6 py-2 text-sm font-medium text-white">
+	<input
+		id="secretValue"
+		bind:value
+		bind:this={valueEl}
+		required
+		placeholder="J$#@UIO%HO#$U%H"
+		class="-mx-2 w-64 border-2 border-transparent"
+		class:bg-transparent={!isNewSecret}
+		class:cursor-not-allowed={!isNewSecret}
+		readonly={!isNewSecret}
+	/>
+</td>
+<td class="whitespace-nowrap px-6 py-2 text-center text-sm font-medium text-white">
+	<div
+		type="button"
+		on:click={setSecretValue}
+		aria-pressed="false"
+		class="relative inline-flex h-6 w-11 flex-shrink-0 rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out"
+		class:bg-green-600={isBuildSecret}
+		class:bg-stone-700={!isBuildSecret}
+		class:opacity-50={!isNewSecret}
+		class:cursor-not-allowed={!isNewSecret}
+		class:cursor-pointer={isNewSecret}
+	>
+		<span class="sr-only">Use isBuildSecret</span>
+		<span
+			class="pointer-events-none relative inline-block h-5 w-5 transform rounded-full bg-white shadow transition duration-200 ease-in-out"
+			class:translate-x-5={isBuildSecret}
+			class:translate-x-0={!isBuildSecret}
+		>
+			<span
+				class=" absolute inset-0 flex h-full w-full items-center justify-center transition-opacity duration-200 ease-in"
+				class:opacity-0={isBuildSecret}
+				class:opacity-100={!isBuildSecret}
+				aria-hidden="true"
+			>
+				<svg class="h-3 w-3 bg-white text-red-600" fill="none" viewBox="0 0 12 12">
+					<path
+						d="M4 8l2-2m0 0l2-2M6 6L4 4m2 2l2 2"
+						stroke="currentColor"
+						stroke-width="2"
+						stroke-linecap="round"
+						stroke-linejoin="round"
+					/>
+				</svg>
+			</span>
+			<span
+				class="absolute inset-0 flex h-full w-full items-center justify-center transition-opacity duration-100 ease-out"
+				aria-hidden="true"
+				class:opacity-100={isBuildSecret}
+				class:opacity-0={!isBuildSecret}
+			>
+				<svg class="h-3 w-3 bg-white text-green-600" fill="currentColor" viewBox="0 0 12 12">
+					<path
+						d="M3.707 5.293a1 1 0 00-1.414 1.414l1.414-1.414zM5 8l-.707.707a1 1 0 001.414 0L5 8zm4.707-3.293a1 1 0 00-1.414-1.414l1.414 1.414zm-7.414 2l2 2 1.414-1.414-2-2-1.414 1.414zm3.414 2l4-4-1.414-1.414-4 4 1.414 1.414z"
+					/>
+				</svg>
+			</span>
+		</span>
 	</div>
-</div>
+</td>
+<td class="whitespace-nowrap px-6 py-2 text-sm font-medium text-white">
+	{#if isNewSecret}
+		<div class="flex items-center justify-center">
+			<button class="w-24 bg-green-600 hover:bg-green-500" on:click={saveSecret}>Add</button>
+		</div>
+	{:else}
+		<div class="flex justify-center items-end">
+			<button class="w-24 bg-red-600 hover:bg-red-500" on:click={removeSecret}>Remove</button>
+		</div>
+	{/if}
+</td>

src/routes/applications/[id]/secrets/index.json.ts

@@ -1,6 +1,6 @@
 import { getTeam, getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const get: RequestHandler = async (event) => {
@@ -18,7 +18,7 @@ export const get: RequestHandler = async (event) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };
 
@@ -33,7 +33,7 @@ export const post: RequestHandler = async (event) => {
 		const found = await db.isSecretExists({ id, name });
 		if (found) {
 			throw {
-				error: `Secret ${name} already exists`
+				error: `Secret ${name} already exists.`
 			};
 		} else {
 			await db.createSecret({ id, name, value, isBuildSecret });
@@ -42,7 +42,7 @@ export const post: RequestHandler = async (event) => {
 			};
 		}
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };
 export const del: RequestHandler = async (event) => {
@@ -58,6 +58,6 @@ export const del: RequestHandler = async (event) => {
 			status: 200
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

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

@@ -24,6 +24,15 @@
 	export let application;
 	import Secret from './_Secret.svelte';
 	import { getDomain } from '$lib/components/common';
+	import { page } from '$app/stores';
+	import { get } from '$lib/api';
+
+	const { id } = $page.params;
+
+	async function refreshSecrets() {
+		const data = await get(`/applications/${id}/secrets.json`);
+		secrets = [...data.secrets];
+	}
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
@@ -31,11 +40,47 @@
 		Secrets for <a href={application.fqdn} target="_blank">{getDomain(application.fqdn)}</a>
 	</div>
 </div>
-<div class="mx-auto max-w-4xl px-6">
-	<div class="flex-col justify-start space-y-1">
-		{#each secrets as secret}
-			<Secret name={secret.name} value={secret.value} isBuildSecret={secret.isBuildSecret} />
-		{/each}
-		<Secret isNewSecret />
-	</div>
+<div class="mx-auto max-w-6xl rounded-xl px-6 pt-4">
+	<table class="mx-auto">
+		<thead class=" rounded-xl border-b border-coolgray-500">
+			<tr>
+				<th
+					scope="col"
+					class="px-6 py-3 text-left text-xs font-bold uppercase tracking-wider text-warmGray-400"
+					>Name</th
+				>
+				<th
+					scope="col"
+					class="px-6 py-3 text-left text-xs font-bold uppercase tracking-wider text-warmGray-400"
+					>Value</th
+				>
+				<th
+					scope="col"
+					class="px-6 py-3 text-left text-xs font-bold uppercase tracking-wider text-warmGray-400"
+					>Need during buildtime?</th
+				>
+				<th
+					scope="col"
+					class="px-6 py-3 text-left text-xs font-bold uppercase tracking-wider text-warmGray-400"
+				/>
+			</tr>
+		</thead>
+		<tbody class="">
+			{#each secrets as secret}
+				{#key secret.id}
+					<tr class="hover:bg-coolgray-200">
+						<Secret
+							name={secret.name}
+							value={secret.value ? secret.value : 'ENCRYPTED'}
+							isBuildSecret={secret.isBuildSecret}
+							on:refresh={refreshSecrets}
+						/>
+					</tr>
+				{/key}
+			{/each}
+			<tr>
+				<Secret isNewSecret on:refresh={refreshSecrets} />
+			</tr>
+		</tbody>
+	</table>
 </div>

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

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -14,6 +14,6 @@ export const post: RequestHandler = async (event) => {
 		await db.setApplicationSettings({ id, debug, previews });
 		return { status: 201 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

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

@@ -1,6 +1,6 @@
 import { getDomain, getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import { dockerInstance } from '$lib/docker';
 import { removeProxyConfiguration } from '$lib/haproxy';
 import type { RequestHandler } from '@sveltejs/kit';
@@ -26,6 +26,6 @@ export const post: RequestHandler = async (event) => {
 			status: 200
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/applications/index.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const get: RequestHandler = async (event) => {
@@ -16,6 +16,6 @@ export const get: RequestHandler = async (event) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/databases/[id]/configuration/destination.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -14,6 +14,6 @@ export const post: RequestHandler = async (event) => {
 		await db.configureDestinationForDatabase({ id, destinationId });
 		return { status: 201 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/databases/[id]/configuration/type.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler, supportedDatabaseTypesAndVersions } from '$lib/database';
+import { ErrorHandler, supportedDatabaseTypesAndVersions } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const get: RequestHandler = async (event) => {
@@ -27,6 +27,6 @@ export const post: RequestHandler = async (event) => {
 			status: 201
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/databases/[id]/configuration/version.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler, supportedDatabaseTypesAndVersions } from '$lib/database';
+import { ErrorHandler, supportedDatabaseTypesAndVersions } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const get: RequestHandler = async (event) => {
@@ -31,6 +31,6 @@ export const post: RequestHandler = async (event) => {
 			status: 201
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/databases/[id]/delete.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler, stopDatabase } from '$lib/database';
+import { ErrorHandler, stopDatabase } from '$lib/database';
 import { deleteProxy } from '$lib/haproxy';
 import type { RequestHandler } from '@sveltejs/kit';
 
@@ -17,6 +17,6 @@ export const del: RequestHandler = async (event) => {
 		await db.removeDatabase({ id });
 		return { status: 200 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/databases/[id]/index.json.ts

@@ -1,6 +1,6 @@
 import { asyncExecShell, getEngine, getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { generateDatabaseConfiguration, getVersions, PrismaErrorHandler } from '$lib/database';
+import { generateDatabaseConfiguration, getVersions, ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const get: RequestHandler = async (event) => {
@@ -25,9 +25,7 @@ export const get: RequestHandler = async (event) => {
 					state = 'running';
 				}
 			} catch (error) {
-				// if (!error.stderr.includes('No such object')) {
-				//     console.log(error)
-				// }
+				//
 			}
 		}
 		const configuration = generateDatabaseConfiguration(database);
@@ -42,7 +40,7 @@ export const get: RequestHandler = async (event) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };
 
@@ -66,6 +64,6 @@ export const post: RequestHandler = async (event) => {
 		});
 		return { status: 201 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/databases/[id]/settings.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { generateDatabaseConfiguration, PrismaErrorHandler } from '$lib/database';
+import { generateDatabaseConfiguration, ErrorHandler } from '$lib/database';
 import { startTcpProxy, stopTcpHttpProxy } from '$lib/haproxy';
 import type { RequestHandler } from '@sveltejs/kit';
 
@@ -29,6 +29,6 @@ export const post: RequestHandler = async (event) => {
 			status: 201
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/databases/[id]/start.json.ts

@@ -1,6 +1,6 @@
 import { asyncExecShell, createDirectories, getEngine, getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { generateDatabaseConfiguration, PrismaErrorHandler } from '$lib/database';
+import { generateDatabaseConfiguration, ErrorHandler } from '$lib/database';
 import { promises as fs } from 'fs';
 import yaml from 'js-yaml';
 import type { RequestHandler } from '@sveltejs/kit';
@@ -77,6 +77,6 @@ export const post: RequestHandler = async (event) => {
 			};
 		}
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/databases/[id]/stop.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler, stopDatabase } from '$lib/database';
+import { ErrorHandler, stopDatabase } from '$lib/database';
 import { stopTcpHttpProxy } from '$lib/haproxy';
 import type { RequestHandler } from '@sveltejs/kit';
 
@@ -20,6 +20,6 @@ export const post: RequestHandler = async (event) => {
 			status: 200
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/databases/index.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const get: RequestHandler = async (event) => {
@@ -15,6 +15,6 @@ export const get: RequestHandler = async (event) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/destinations/[id]/index.json.ts

@@ -1,6 +1,6 @@
 import { asyncExecShell, getEngine, getTeam, getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import { checkContainer } from '$lib/haproxy';
 import type { RequestHandler } from '@sveltejs/kit';
 
@@ -12,7 +12,8 @@ export const get: RequestHandler = async (event) => {
 	try {
 		const destination = await db.getDestination({ id, teamId });
 		const settings = await db.listSettings();
-		const state = await checkContainer(destination.engine, 'coolify-haproxy');
+		const state =
+			destination?.engine && (await checkContainer(destination.engine, 'coolify-haproxy'));
 		return {
 			status: 200,
 			body: {
@@ -22,7 +23,7 @@ export const get: RequestHandler = async (event) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };
 export const post: RequestHandler = async (event) => {
@@ -36,7 +37,7 @@ export const post: RequestHandler = async (event) => {
 		await db.updateDestination({ id, name, engine, network });
 		return { status: 200 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };
 
@@ -50,6 +51,6 @@ export const del: RequestHandler = async (event) => {
 		await db.removeDestination({ id });
 		return { status: 200 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/destinations/[id]/scan.json.ts

@@ -1,6 +1,6 @@
 import { asyncExecShell, getTeam, getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import { dockerInstance } from '$lib/docker';
 import type { RequestHandler } from '@sveltejs/kit';
 
@@ -59,6 +59,6 @@ export const post: RequestHandler = async (event) => {
 			status: 404
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/destinations/[id]/settings.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -13,6 +13,6 @@ export const post: RequestHandler = async (event) => {
 		await db.setDestinationSettings({ engine, isCoolifyProxyUsed });
 		return { status: 200 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/destinations/[id]/start.json.ts

@@ -1,5 +1,5 @@
 import { getUserDetails } from '$lib/common';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import { startCoolifyProxy, stopCoolifyProxy } from '$lib/haproxy';
 import type { RequestHandler } from '@sveltejs/kit';
 
@@ -16,6 +16,6 @@ export const post: RequestHandler = async (event) => {
 		};
 	} catch (error) {
 		await stopCoolifyProxy(engine);
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/destinations/[id]/stop.json.ts

@@ -1,5 +1,5 @@
 import { getUserDetails } from '$lib/common';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import { stopCoolifyProxy } from '$lib/haproxy';
 import type { RequestHandler } from '@sveltejs/kit';
 
@@ -14,6 +14,6 @@ export const post: RequestHandler = async (event) => {
 			status: 200
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/destinations/index.json.ts

@@ -1,6 +1,6 @@
 import { getTeam, getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const get: RequestHandler = async (request) => {
@@ -14,6 +14,6 @@ export const get: RequestHandler = async (request) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/index.json.ts

@@ -1,6 +1,6 @@
 import { getTeam, getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const get: RequestHandler = async (event) => {
@@ -25,7 +25,7 @@ export const get: RequestHandler = async (event) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };
 

src/routes/login/index.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -13,7 +13,7 @@ export const post: RequestHandler = async (event) => {
 			status: 200
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };
 
@@ -28,6 +28,6 @@ export const get: RequestHandler = async (event) => {
 		await db.getUser({ userId });
 		return { status: 200 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/new/application/import.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -24,6 +24,6 @@ export const post: RequestHandler = async (event) => {
 		});
 		return { status: 201, body: { id } };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/new/application/index.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails, uniqueName } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -14,6 +14,6 @@ export const post: RequestHandler = async (event) => {
 		const { id } = await db.newApplication({ name, teamId });
 		return { status: 201, body: { id } };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/new/database/index.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -13,6 +13,6 @@ export const post: RequestHandler = async (event) => {
 		const { id } = await db.newDatabase({ name, teamId });
 		return { status: 201, body: { id } };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/new/destination/check.json.ts

@@ -1,5 +1,5 @@
 import { getUserDetails } from '$lib/common';
-import { isDockerNetworkExists, PrismaErrorHandler } from '$lib/database';
+import { isDockerNetworkExists, ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -18,6 +18,6 @@ export const post: RequestHandler = async (event) => {
 			status: 200
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/new/destination/docker.json.ts

@@ -1,6 +1,6 @@
 import { asyncExecShell, getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import { dockerInstance } from '$lib/docker';
 import type { RequestHandler } from '@sveltejs/kit';
 
@@ -14,6 +14,6 @@ export const post: RequestHandler = async (event) => {
 		const id = await db.newDestination({ name, teamId, engine, network, isCoolifyProxyUsed });
 		return { status: 200, body: { id } };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/new/service/index.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails, uniqueName } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -13,6 +13,6 @@ export const post: RequestHandler = async (event) => {
 		const { id } = await db.newService({ name, teamId });
 		return { status: 201, body: { id } };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/new/source/index.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -12,6 +12,6 @@ export const post: RequestHandler = async (event) => {
 		const { id } = await db.newSource({ name, teamId, type, htmlUrl, apiUrl, organization });
 		return { status: 201, body: { id } };
 	} catch (e) {
-		return PrismaErrorHandler(e);
+		return ErrorHandler(e);
 	}
 };

src/routes/new/team/index.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails, uniqueName } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -13,6 +13,6 @@ export const post: RequestHandler = async (event) => {
 		const { id } = await db.newTeam({ name, userId });
 		return { status: 201, body: { id } };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/services/[id]/_Services/_Services.svelte

@@ -110,25 +110,9 @@
 						required
 					/>
 					<Explainer
-						text="If you specify <span class='text-green-600 font-bold'>https</span>, the application will be accessible only over https. SSL certificate will be generated for you."
+						text="If you specify <span class='text-pink-600 font-bold'>https</span>, the application will be accessible only over https. SSL certificate will be generated for you.<br>If you specify <span class='text-pink-600 font-bold'>www</span>, the application will be redirected (302) from non-www and vice versa.<br><br>To modify the domain, you must first stop the application."
 					/>
 				</div>
-				<!-- {:else}
-					<label for="fqdn" class="pt-2">Domain (FQDN)</label>
-					<div class="col-span-2 ">
-						<CopyPasswordField
-							placeholder="eg: https://analytics.coollabs.io"
-							readonly={!$session.isAdmin}
-							name="fqdn"
-							id="fqdn"
-							bind:value={service.fqdn}
-							required
-						/>
-						<Explainer
-							text="If you specify <span class='text-green-600'>https</span>, the application will be accessible only over https. SSL certificate will be generated for you."
-						/>
-					</div>
-				{/if} -->
 			</div>
 			{#if service.type === 'plausibleanalytics'}
 				<PlausibleAnalytics bind:service {readOnly} />

src/routes/services/[id]/__layout.svelte

@@ -110,23 +110,23 @@
 			loading = false;
 		}
 	}
-	onMount(async () => {
-		if (
-			service.type &&
-			service.destinationDockerId &&
-			service.version &&
-			service.fqdn &&
-			!isRunning
-		) {
-			try {
-				await post(`/services/${service.id}/${service.type}/stop.json`, {});
-			} catch ({ error }) {
-				return errorNotification(error);
-			} finally {
-				loading = false;
-			}
-		}
-	});
+	// onMount(async () => {
+	// 	if (
+	// 		service.type &&
+	// 		service.destinationDockerId &&
+	// 		service.version &&
+	// 		service.fqdn &&
+	// 		!isRunning
+	// 	) {
+	// 		try {
+	// 			await post(`/services/${service.id}/${service.type}/stop.json`, {});
+	// 		} catch ({ error }) {
+	// 			return errorNotification(error);
+	// 		} finally {
+	// 			loading = false;
+	// 		}
+	// 	}
+	// });
 </script>
 
 <nav class="nav-side">

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

@@ -1,6 +1,6 @@
 import { asyncExecShell, getDomain, getEngine, getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -21,6 +21,6 @@ export const post: RequestHandler = async (event) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/services/[id]/configuration/destination.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -14,6 +14,6 @@ export const post: RequestHandler = async (event) => {
 		await db.configureDestinationForService({ id, destinationId });
 		return { status: 201 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/services/[id]/configuration/type.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler, supportedServiceTypesAndVersions } from '$lib/database';
+import { ErrorHandler, supportedServiceTypesAndVersions } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const get: RequestHandler = async (event) => {
@@ -27,6 +27,6 @@ export const post: RequestHandler = async (event) => {
 			status: 201
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/services/[id]/configuration/type.svelte

@@ -36,6 +36,7 @@
 	import Wordpress from '$lib/components/svg/services/Wordpress.svelte';
 	import { goto } from '$app/navigation';
 	import { post } from '$lib/api';
+	import VaultWarden from '$lib/components/svg/services/VaultWarden.svelte';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
@@ -71,6 +72,8 @@
 						<VsCodeServer isAbsolute />
 					{:else if type.name === 'wordpress'}
 						<Wordpress isAbsolute />
+					{:else if type.name === 'vaultwarden'}
+						<VaultWarden isAbsolute />
 					{/if}{type.fancyName}
 				</button>
 			</form>

src/routes/services/[id]/configuration/version.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler, supportedServiceTypesAndVersions } from '$lib/database';
+import { ErrorHandler, supportedServiceTypesAndVersions } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const get: RequestHandler = async (event) => {
@@ -18,7 +18,7 @@ export const get: RequestHandler = async (event) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };
 
@@ -35,6 +35,6 @@ export const post: RequestHandler = async (event) => {
 			status: 201
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/services/[id]/delete.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const del: RequestHandler = async (events) => {
@@ -13,6 +13,6 @@ export const del: RequestHandler = async (events) => {
 		await db.removeService({ id });
 		return { status: 200 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/services/[id]/index.json.ts

@@ -4,7 +4,7 @@ import {
 	generateDatabaseConfiguration,
 	getServiceImage,
 	getVersions,
-	PrismaErrorHandler
+	ErrorHandler
 } from '$lib/database';
 import { dockerInstance } from '$lib/docker';
 import type { RequestHandler } from '@sveltejs/kit';
@@ -43,27 +43,6 @@ export const get: RequestHandler = async (event) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };
-
-// export const post: RequestHandler<Locals, FormData> = async (request) => {
-//     const { teamId, status, body } = await getUserDetails(request);
-//     if (status === 401) return { status, body }
-//     const { id } = request.params
-
-//     const name = request.body.get('name')
-//     const defaultDatabase = request.body.get('defaultDatabase')
-//     const dbUser = request.body.get('dbUser')
-//     const dbUserPassword = request.body.get('dbUserPassword')
-//     const rootUser = request.body.get('rootUser')
-//     const rootUserPassword = request.body.get('rootUserPassword')
-//     const version = request.body.get('version')
-
-//     try {
-//         return await db.updateDatabase({ id, name, defaultDatabase, dbUser, dbUserPassword, rootUser, rootUserPassword, version })
-//     } catch (err) {
-//         return err
-//     }
-
-// }

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

@@ -36,6 +36,7 @@
 	import Wordpress from '$lib/components/svg/services/Wordpress.svelte';
 	import Services from './_Services/_Services.svelte';
 	import { getDomain } from '$lib/components/common';
+	import VaultWarden from '$lib/components/svg/services/VaultWarden.svelte';
 
 	export let service;
 	export let isRunning;
@@ -94,6 +95,10 @@
 			<a href="https://wordpress.org" target="_blank">
 				<Wordpress />
 			</a>
+		{:else if service.type === 'vaultwarden'}
+			<a href="https://github.com/dani-garcia/vaultwarden" target="_blank">
+				<VaultWarden />
+			</a>
 		{/if}
 	</div>
 </div>

src/routes/services/[id]/minio/index.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -16,6 +16,6 @@ export const post: RequestHandler = async (event) => {
 		await db.updateNocoDbOrMinioService({ id, fqdn, name });
 		return { status: 201 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/services/[id]/minio/start.json.ts

@@ -5,14 +5,16 @@ import yaml from 'js-yaml';
 import type { RequestHandler } from '@sveltejs/kit';
 import { letsEncrypt } from '$lib/letsencrypt';
 import {
+	checkHAProxy,
 	configureSimpleServiceProxyOn,
 	reloadHaproxy,
+	setWwwRedirection,
 	startHttpProxy,
 	startTcpProxy
 } from '$lib/haproxy';
 import getPort from 'get-port';
 import { getDomain } from '$lib/components/common';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 
 export const post: RequestHandler = async (event) => {
 	const { teamId, status, body } = await getUserDetails(event);
@@ -21,6 +23,7 @@ export const post: RequestHandler = async (event) => {
 	const { id } = event.params;
 
 	try {
+		await checkHAProxy();
 		const service = await db.getService({ id, teamId });
 		const {
 			type,
@@ -86,22 +89,22 @@ export const post: RequestHandler = async (event) => {
 		try {
 			await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`);
 			await configureSimpleServiceProxyOn({ id, domain, port: consolePort });
-
 			await db.updateMinioService({ id, publicPort });
 			await startHttpProxy(destinationDocker, id, publicPort, apiPort);
 
 			if (isHttps) {
 				await letsEncrypt({ domain, id });
 			}
+			await setWwwRedirection(fqdn);
 			await reloadHaproxy(destinationDocker.engine);
 			return {
 				status: 200
 			};
 		} catch (error) {
 			console.log(error);
-			return PrismaErrorHandler(error);
+			return ErrorHandler(error);
 		}
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/services/[id]/minio/stop.json.ts

@@ -1,7 +1,7 @@
 import { getEngine, getUserDetails, removeDestinationDocker } from '$lib/common';
 import { getDomain } from '$lib/components/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import { dockerInstance } from '$lib/docker';
 import { checkContainer, configureSimpleServiceProxyOff, stopTcpHttpProxy } from '$lib/haproxy';
 import type { RequestHandler } from '@sveltejs/kit';
@@ -33,14 +33,18 @@ export const post: RequestHandler = async (event) => {
 			} catch (error) {
 				console.error(error);
 			}
-			await stopTcpHttpProxy(destinationDocker, publicPort);
-			await configureSimpleServiceProxyOff({ domain });
+			try {
+				await stopTcpHttpProxy(destinationDocker, publicPort);
+				await configureSimpleServiceProxyOff({ domain });
+			} catch (error) {
+				console.log(error);
+			}
 		}
 
 		return {
 			status: 200
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/services/[id]/nocodb/index.json.ts

@@ -1,6 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -15,6 +15,6 @@ export const post: RequestHandler = async (event) => {
 		await db.updateNocoDbOrMinioService({ id, fqdn, name });
 		return { status: 201 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/services/[id]/nocodb/start.json.ts

@@ -4,9 +4,14 @@ import { promises as fs } from 'fs';
 import yaml from 'js-yaml';
 import type { RequestHandler } from '@sveltejs/kit';
 import { letsEncrypt } from '$lib/letsencrypt';
-import { configureSimpleServiceProxyOn, reloadHaproxy } from '$lib/haproxy';
+import {
+	checkHAProxy,
+	configureSimpleServiceProxyOn,
+	reloadHaproxy,
+	setWwwRedirection
+} from '$lib/haproxy';
 import { getDomain } from '$lib/components/common';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 
 export const post: RequestHandler = async (event) => {
 	const { teamId, status, body } = await getUserDetails(event);
@@ -15,6 +20,7 @@ export const post: RequestHandler = async (event) => {
 	const { id } = event.params;
 
 	try {
+		await checkHAProxy();
 		const service = await db.getService({ id, teamId });
 		const { type, version, fqdn, destinationDockerId, destinationDocker } = service;
 
@@ -52,15 +58,15 @@ export const post: RequestHandler = async (event) => {
 			if (isHttps) {
 				await letsEncrypt({ domain, id });
 			}
+			await setWwwRedirection(fqdn);
 			await reloadHaproxy(destinationDocker.engine);
 			return {
 				status: 200
 			};
 		} catch (error) {
-			console.log(error);
-			return PrismaErrorHandler(error);
+			return ErrorHandler(error);
 		}
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };