From 7a26cc5dc86d517bc50492ce4a77c9a82f6acdc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C5=91rik=20Levente?=
 <33373714+Levminer@users.noreply.github.com>
Date: Fri, 28 Jun 2024 20:11:09 +0200
Subject: [PATCH] Loading and logging fixes

---
 apps/app/layout/app.svelte                   |  7 +++----
 packages/ui/navigation/desktopLoading.svelte |  8 ++++++++
 packages/ui/navigation/loading.svelte        | 13 ++++++++++---
 packages/ui/pages/onboarding.svelte          |  9 +++++----
 packages/ui/pages/settings.svelte            |  3 ++-
 platforms/windows/service/Program.cs         |  2 +-
 6 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/apps/app/layout/app.svelte b/apps/app/layout/app.svelte
index ba65594..e1d8e6e 100644
--- a/apps/app/layout/app.svelte
+++ b/apps/app/layout/app.svelte
@@ -137,16 +137,15 @@
 			ws.onclose = (e) => {
 				console.log("Socket is closed.  Reconnecting...", e.reason)
 				setTimeout(() => {
-					if (retries == 3) {
-						sessionStorage.clear()
-						location.reload()
+					if (retries == 10) {
+						retries = 0
 					}
 
 					connectToWSServer()
 
 					console.log(`Reconnecting... (Retry #${retries + 1})`)
 					retries++
-				}, 1000)
+				}, 1000 * retries)
 			}
 		}
 
diff --git a/packages/ui/navigation/desktopLoading.svelte b/packages/ui/navigation/desktopLoading.svelte
index 4df87d3..c72a381 100644
--- a/packages/ui/navigation/desktopLoading.svelte
+++ b/packages/ui/navigation/desktopLoading.svelte
@@ -12,6 +12,9 @@
 			<li>
 				Make sure the Cores Service is running: <button class="underline" on:click={startService}>Launch service</button>
 			</li>
+			<li>
+				Restart Cores: <button class="underline" on:click={reload}>Restart</button>
+			</li>
 		</ul>
 	</div>
 </div>
@@ -24,6 +27,11 @@
 		await invoke("start_service")
 	}
 
+	const reload = () => {
+		sessionStorage.clear()
+		location.reload()
+	}
+
 	onMount(async () => {
 		try {
 			// Check if service is running
diff --git a/packages/ui/navigation/loading.svelte b/packages/ui/navigation/loading.svelte
index 65e91ef..196ce5c 100644
--- a/packages/ui/navigation/loading.svelte
+++ b/packages/ui/navigation/loading.svelte
@@ -6,15 +6,16 @@
 	</div>
 
 	<h1>Loading...</h1>
-	<div class="transparent-900 m-3 my-10 rounded-xl p-8 text-left">
+	<div class="error transparent-900 m-3 my-10 hidden rounded-xl border-2 border-red-700 p-8 text-left">
 		<h2 class="mb-5">App not loading?</h2>
 		<ul class="list-inside list-disc">
+			<li>The connection might be slow, try waiting a few seconds</li>
 			<li>
 				Try to <button class="underline" on:click={reload}>Refresh</button> this page
 			</li>
-			<li>Restart your Cores app</li>
+			<li>Restart your Cores app on your computer</li>
 			<li>
-				Make sure you typed in the <button class="underline" on:click={connectionCode}>connection code</button> in the settings right
+				Make sure the <button class="underline" on:click={connectionCode}>connection code</button> in the settings is correct
 			</li>
 			<li>
 				Go back to the <a class="underline" href="/">home</a> page
@@ -34,4 +35,10 @@
 	const connectionCode = () => {
 		location.href = "/settings"
 	}
+
+	onMount(() => {
+		setInterval(() => {
+			document.querySelector(".error").classList.remove("hidden")
+		}, 5000)
+	})
 </script>
diff --git a/packages/ui/pages/onboarding.svelte b/packages/ui/pages/onboarding.svelte
index 635102a..06ff3b0 100644
--- a/packages/ui/pages/onboarding.svelte
+++ b/packages/ui/pages/onboarding.svelte
@@ -85,7 +85,7 @@
 			<div class="flex flex-col gap-3">
 				<button
 					on:click={() => {
-						router.goto("/home")
+						router.goto("/home", true)
 					}}
 					class="transparent-900 flex items-center justify-center gap-3 rounded-xl px-20 py-5 text-xl font-semibold shadow-md"
 				>
@@ -94,7 +94,7 @@
 				</button>
 				<button
 					on:click={() => {
-						router.goto("/connections")
+						router.goto("/connections", true)
 					}}
 					class="transparent-900 flex items-center justify-center gap-3 rounded-xl px-20 py-5 text-xl font-semibold shadow-md"
 				>
@@ -103,7 +103,7 @@
 				</button>
 				<button
 					on:click={() => {
-						router.goto("/settings")
+						router.goto("/settings", true)
 					}}
 					class="transparent-900 flex items-center justify-center gap-3 rounded-xl px-20 py-5 text-xl font-semibold shadow-md"
 				>
@@ -123,6 +123,7 @@
 	import { settings } from "../stores/settings.ts"
 	import { Popover } from "bits-ui"
 	import { flyAndScale } from "../utils/transitions.ts"
+	import build from "../../../build.json"
 
 	let trialOver = false
 
@@ -166,7 +167,7 @@
 			const options = {
 				method: "POST",
 				headers: { "content-type": "application/json" },
-				body: JSON.stringify({ license_key: key.value, instance_name: "CoresDesktop" }),
+				body: JSON.stringify({ license_key: key.value, instance_name: `CoresDesktop-${build.number}` }),
 			}
 
 			try {
diff --git a/packages/ui/pages/settings.svelte b/packages/ui/pages/settings.svelte
index ab346d0..68f4184 100644
--- a/packages/ui/pages/settings.svelte
+++ b/packages/ui/pages/settings.svelte
@@ -145,7 +145,8 @@
 		])
 
 		if (ua.fullVersionList !== undefined && ua.fullVersionList.length > 0) {
-			chromium_version = ua.fullVersionList?.[0]?.version || "N/A"
+			// @ts-ignore
+			chromium_version = ua.fullVersionList.filter((item) => item.brand === "Chromium")[0]?.version || "N/A"
 		}
 
 		const systemInfo: SystemInfo = await invoke("system_info")
diff --git a/platforms/windows/service/Program.cs b/platforms/windows/service/Program.cs
index d0e3a34..00723f7 100644
--- a/platforms/windows/service/Program.cs
+++ b/platforms/windows/service/Program.cs
@@ -38,7 +38,7 @@ public static void Main(string[] args) {
 
 		Log.Logger = new LoggerConfiguration()
 				.WriteTo.Console()
-				.WriteTo.File("./cores-service.log")
+				.WriteTo.File(Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Cores", "service.log"))
 				.CreateLogger();
 
 		AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;