From 4dcc76d3663ae05082dc3a6385db9b903cb58da0 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 2 Mar 2022 13:37:06 +0100
Subject: [PATCH] fix: Update process

---
 package.json               |  2 +-
 src/routes/__layout.svelte | 12 +++++-------
 src/routes/update.json.ts  | 35 +++++++----------------------------
 3 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/package.json b/package.json
index d9b5225e0..b3cb422fa 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "coolify",
 	"description": "An open-source & self-hostable Heroku / Netlify alternative.",
-	"version": "2.0.25",
+	"version": "2.0.26",
 	"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",
diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index ec314efb0..ce9cd7c0f 100644
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -63,13 +63,11 @@
 					const data = await get(`/update.json`);
 					if (overrideVersion || data?.isUpdateAvailable) {
 						latestVersion = overrideVersion || data.latestVersion;
-						console.log('checking update');
-						const { exists } = await post(`/update.json`, {
-							type: 'check',
-							latestVersion,
-							overrideVersion
-						});
-						isUpdateAvailable = exists;
+						if (overrideVersion) {
+							isUpdateAvailable = true;
+						} else {
+							isUpdateAvailable = data.isUpdateAvailable;
+						}
 					}
 				} catch (error) {
 				} finally {
diff --git a/src/routes/update.json.ts b/src/routes/update.json.ts
index 87a728352..2bcd5681a 100644
--- a/src/routes/update.json.ts
+++ b/src/routes/update.json.ts
@@ -6,13 +6,16 @@ import type { RequestHandler } from '@sveltejs/kit';
 import compare from 'compare-versions';
 import got from 'got';
 
-export const get: RequestHandler = async () => {
+export const get: RequestHandler = async (request) => {
 	try {
 		const currentVersion = version;
 		const versions = await got
 			.get(`https://get.coollabs.io/versions.json?appId=${process.env['COOLIFY_APP_ID']}`)
 			.json();
-		const latestVersion = versions['coolify'].main.version;
+		const latestVersion =
+			request.url.hostname === 'staging.coolify.io'
+				? versions['coolify'].next.version
+				: versions['coolify'].main.version;
 		const isUpdateAvailable = compare(latestVersion, currentVersion);
 		return {
 			body: {
@@ -21,12 +24,13 @@ export const get: RequestHandler = async () => {
 			}
 		};
 	} catch (error) {
+		console.log(error);
 		return ErrorHandler(error);
 	}
 };
 
 export const post: RequestHandler = async (event) => {
-	const { type, latestVersion, overrideVersion } = await event.request.json();
+	const { type, latestVersion } = await event.request.json();
 	if (type === 'update') {
 		try {
 			if (!dev) {
@@ -50,31 +54,6 @@ export const post: RequestHandler = async (event) => {
 		} catch (error) {
 			return ErrorHandler(error);
 		}
-	} else if (type === 'check') {
-		try {
-			if (overrideVersion) {
-				return {
-					status: 200,
-					body: {
-						exists: true
-					}
-				};
-			}
-			await asyncExecShell(`docker image inspect coollabsio/coolify:${latestVersion}`);
-			return {
-				status: 200,
-				body: {
-					exists: true
-				}
-			};
-		} catch (error) {
-			return {
-				status: 200,
-				body: {
-					exists: false
-				}
-			};
-		}
 	}
 	return {
 		status: 500