- Rename error handler.

- Truncate errors.
- Better error tags, release version etc.

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) {
+	if (dev) {
 		Sentry.init({
 			dsn: process.env['COOLIFY_SENTRY_DSN'],
 			tracesSampleRate: 0,
-			environment: 'production'
+			environment: 'dev',
+			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) {

src/lib/database/applications.ts

@@ -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/common.ts

@@ -36,23 +36,34 @@ 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('-');
+	}
+	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.';
 		}
 	}

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';
 

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 {
@@ -8,6 +8,6 @@ export async function listLogs({ buildId, last = 0 }) {
 		});
 		return [...body];
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 }

src/lib/haproxy/index.ts

@@ -460,7 +460,7 @@ export async function startCoolifyProxy(engine) {
 		);
 		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' --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}`
+			`DOCKER_HOST="${host}" docker run -e HAPROXY_USERNAME=${proxyUser} -e HAPROXY_PASSWORD=${proxyPassword} --restarts 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);

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/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,
@@ -30,18 +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 });
-							await setWwwRedirection(fqdn);
+							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);
+							}
 						}
 					}
 				}

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/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) => {
@@ -23,7 +23,7 @@ export const get: RequestHandler = async (event) => {
 			status: 200
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };
 
@@ -42,6 +42,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]/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/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);
 	}
 };
 
@@ -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]/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) => {
@@ -40,7 +40,7 @@ export const get: RequestHandler = async (event) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };
 
@@ -64,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';
 
@@ -23,7 +23,7 @@ export const get: RequestHandler = async (event) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };
 export const post: RequestHandler = async (event) => {
@@ -37,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);
 	}
 };
 
@@ -51,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';
 
@@ -15,7 +15,8 @@ export const post: RequestHandler = async (event) => {
 			status: 200
 		};
 	} catch (error) {
+		return ErrorHandler(error);
+	} finally {
 		await stopCoolifyProxy(engine);
-		return PrismaErrorHandler(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]/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/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,6 +43,6 @@ export const get: RequestHandler = async (event) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

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

@@ -13,7 +13,7 @@ import {
 } 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);
@@ -100,9 +100,9 @@ export const post: RequestHandler = async (event) => {
 			};
 		} 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';
@@ -41,6 +41,6 @@ export const post: RequestHandler = async (event) => {
 			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

@@ -6,7 +6,7 @@ import type { RequestHandler } from '@sveltejs/kit';
 import { letsEncrypt } from '$lib/letsencrypt';
 import { 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);
@@ -59,9 +59,9 @@ export const post: RequestHandler = async (event) => {
 			};
 		} catch (error) {
 			console.log(error);
-			return PrismaErrorHandler(error);
+			return ErrorHandler(error);
 		}
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

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

@@ -1,7 +1,7 @@
 import { 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 } from '$lib/haproxy';
 import type { RequestHandler } from '@sveltejs/kit';
@@ -34,6 +34,6 @@ export const post: RequestHandler = async (event) => {
 			status: 200
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/services/[id]/plausibleanalytics/activate.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 { dockerInstance } from '$lib/docker';
 import type { RequestHandler } from '@sveltejs/kit';
 
@@ -28,6 +28,6 @@ export const post: RequestHandler = async (event) => {
 		}
 		return { status: 201 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/services/[id]/plausibleanalytics/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) => {
@@ -21,6 +21,6 @@ export const post: RequestHandler = async (event) => {
 		await db.updatePlausibleAnalyticsService({ id, fqdn, name, email, username });
 		return { status: 201 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

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

@@ -6,7 +6,7 @@ import type { RequestHandler } from '@sveltejs/kit';
 import { letsEncrypt } from '$lib/letsencrypt';
 import { 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);
@@ -191,6 +191,6 @@ COPY ./init-db.sh /docker-entrypoint-initdb.d/init-db.sh`;
 			status: 200
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

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

@@ -1,7 +1,7 @@
 import { 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 } from '$lib/haproxy';
 import type { RequestHandler } from '@sveltejs/kit';
@@ -44,6 +44,6 @@ export const post: RequestHandler = async (event) => {
 			status: 200
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/services/[id]/vaultwarden/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.updateVaultWardenService({ id, fqdn, name });
 		return { status: 201 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

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

@@ -6,7 +6,7 @@ import type { RequestHandler } from '@sveltejs/kit';
 import { letsEncrypt } from '$lib/letsencrypt';
 import { configureSimpleServiceProxyOn, reloadHaproxy, setWwwRedirection } from '$lib/haproxy';
 import { getDomain } from '$lib/components/common';
-import { getServiceImage, PrismaErrorHandler } from '$lib/database';
+import { getServiceImage, ErrorHandler } from '$lib/database';
 
 export const post: RequestHandler = async (event) => {
 	const { teamId, status, body } = await getUserDetails(event);
@@ -76,9 +76,9 @@ export const post: RequestHandler = async (event) => {
 				status: 200
 			};
 		} catch (error) {
-			return PrismaErrorHandler(error);
+			return ErrorHandler(error);
 		}
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

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

@@ -1,7 +1,7 @@
 import { 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 } from '$lib/haproxy';
 import type { RequestHandler } from '@sveltejs/kit';
@@ -34,6 +34,6 @@ export const post: RequestHandler = async (event) => {
 			status: 200
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/services/[id]/vscodeserver/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.updateVsCodeServer({ id, fqdn, name });
 		return { status: 201 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

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

@@ -6,7 +6,7 @@ import type { RequestHandler } from '@sveltejs/kit';
 import { letsEncrypt } from '$lib/letsencrypt';
 import { 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);
@@ -86,9 +86,9 @@ export const post: RequestHandler = async (event) => {
 				status: 200
 			};
 		} catch (error) {
-			return PrismaErrorHandler(error);
+			return ErrorHandler(error);
 		}
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

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

@@ -1,7 +1,7 @@
 import { 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 } from '$lib/haproxy';
 import type { RequestHandler } from '@sveltejs/kit';
@@ -33,6 +33,6 @@ export const post: RequestHandler = async (event) => {
 			status: 200
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/services/[id]/wordpress/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) => {
@@ -19,6 +19,6 @@ export const post: RequestHandler = async (event) => {
 		await db.updateWordpress({ id, fqdn, name, extraConfig, mysqlDatabase });
 		return { status: 201 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

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

@@ -6,7 +6,7 @@ import type { RequestHandler } from '@sveltejs/kit';
 import { letsEncrypt } from '$lib/letsencrypt';
 import { 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);
@@ -124,9 +124,9 @@ export const post: RequestHandler = async (event) => {
 			};
 		} catch (error) {
 			console.log(error);
-			return PrismaErrorHandler(error);
+			return ErrorHandler(error);
 		}
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

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

@@ -1,7 +1,7 @@
 import { 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 } from '$lib/haproxy';
 import type { RequestHandler } from '@sveltejs/kit';
@@ -37,6 +37,6 @@ export const post: RequestHandler = async (event) => {
 			status: 200
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/services/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/settings/check.json.ts

@@ -1,6 +1,6 @@
 import { asyncExecShell, 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) => {
@@ -20,6 +20,6 @@ export const post: RequestHandler = async (event) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/settings/index.json.ts

@@ -1,7 +1,7 @@
 import { dev } from '$app/env';
 import { getDomain, getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { listSettings, PrismaErrorHandler } from '$lib/database';
+import { listSettings, ErrorHandler } from '$lib/database';
 import {
 	checkContainer,
 	configureCoolifyProxyOff,
@@ -29,7 +29,7 @@ export const get: RequestHandler = async (event) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };
 
@@ -55,7 +55,7 @@ export const del: RequestHandler = async (event) => {
 			status: 201
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };
 export const post: RequestHandler = async (event) => {
@@ -112,6 +112,6 @@ export const post: RequestHandler = async (event) => {
 			status: 201
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/sources/[id]/check.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) => {
 		}
 		return { status: 200 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/sources/[id]/gitlab.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.addSource({ id, teamId, oauthId, groupName, appId, appSecret });
 		return { status: 201 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/sources/[id]/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) => {
@@ -19,7 +19,7 @@ export const get: RequestHandler = async (request) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };
 
@@ -33,7 +33,7 @@ export const del: RequestHandler = async (request) => {
 		await db.removeSource({ id });
 		return { status: 200 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };
 
@@ -49,6 +49,6 @@ export const post: RequestHandler = async (event) => {
 		await db.updateGitsource({ id, name });
 		return { status: 201 };
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/sources/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) => {
@@ -11,6 +11,6 @@ export const get: RequestHandler = async (request) => {
 		const sources = await db.listSources(teamId);
 		return { status: 200, body: { sources } };
 	} catch (err) {
-		return PrismaErrorHandler(err);
+		return ErrorHandler(err);
 	}
 };

src/routes/teams/[id]/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) => {
@@ -33,7 +33,7 @@ export const get: RequestHandler = async (event) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };
 
@@ -50,6 +50,6 @@ export const post: RequestHandler = async (event) => {
 			status: 201
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/teams/[id]/invitation/accept.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 type { RequestHandler } from '@sveltejs/kit';
 
@@ -31,6 +31,6 @@ export const post: RequestHandler = async (event) => {
 			status: 200
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/teams/[id]/invitation/invite.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 type { RequestHandler } from '@sveltejs/kit';
 
@@ -64,6 +64,6 @@ export const post: RequestHandler = async (event) => {
 			};
 		}
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/teams/[id]/invitation/revoke.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 type { RequestHandler } from '@sveltejs/kit';
 
@@ -15,6 +15,6 @@ export const post: RequestHandler = async (event) => {
 			status: 200
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/teams/[id]/permission/change.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) => {
@@ -18,6 +18,6 @@ export const post: RequestHandler = async (event) => {
 			status: 201
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/teams/[id]/remove/user.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) => {
@@ -19,6 +19,6 @@ export const post: RequestHandler = async (event) => {
 			status: 201
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/teams/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) => {
@@ -21,6 +21,6 @@ export const get: RequestHandler = async (event) => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/update.json.ts

@@ -1,7 +1,7 @@
 import { dev } from '$app/env';
 import { asyncExecShell, version } from '$lib/common';
 import { asyncSleep } from '$lib/components/common';
-import { PrismaErrorHandler } from '$lib/database';
+import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 import compare from 'compare-versions';
 import got from 'got';
@@ -21,7 +21,7 @@ export const get: RequestHandler = async () => {
 			}
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };
 
@@ -44,7 +44,7 @@ export const post: RequestHandler = async (event) => {
 				};
 			}
 		} catch (error) {
-			return PrismaErrorHandler(error);
+			return ErrorHandler(error);
 		}
 	} else if (type === 'update') {
 		try {
@@ -66,7 +66,7 @@ export const post: RequestHandler = async (event) => {
 				};
 			}
 		} catch (error) {
-			return PrismaErrorHandler(error);
+			return ErrorHandler(error);
 		}
 	}
 	return {

src/routes/webhooks/github/index.ts

@@ -1,7 +1,7 @@
 import { dev } from '$app/env';
 import { getTeam } 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 options = async () => {
@@ -36,6 +36,6 @@ export const get: RequestHandler = async (request) => {
 			headers: { Location: `/webhooks/success` }
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };

src/routes/webhooks/github/install.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 options = async () => {
@@ -24,6 +24,6 @@ export const get: RequestHandler = async (request) => {
 			headers: { Location: `/webhooks/success` }
 		};
 	} catch (error) {
-		return PrismaErrorHandler(error);
+		return ErrorHandler(error);
 	}
 };