From 3e840507710c2a9de8067c45e6dd6a9abeb6cca2 Mon Sep 17 00:00:00 2001
From: zumbiepig <121742281+zumbiepig@users.noreply.github.com>
Date: Mon, 19 Aug 2024 18:17:16 -0700
Subject: [PATCH] .

---
 public/service-worker.js      | 12 ++----------
 src/resources/scripts/main.ts |  9 ++++-----
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/public/service-worker.js b/public/service-worker.js
index ed96f9c..0f24862 100644
--- a/public/service-worker.js
+++ b/public/service-worker.js
@@ -11,17 +11,9 @@ self.addEventListener('install', (event) => {
 
 			for (const asset of cacheAssets) {
 				await cache.add(asset);
-				cachedAssets++;
-				const progress = `${cachedAssets}/${totalAssets}`;
+				const progress = `${++cachedAssets}/${totalAssets}`;
 
-				self.clients.matchAll().then((clients) => {
-					clients.forEach((client) => {
-						client.postMessage({
-							title: 'sw-install-progress',
-							message: progress,
-						});
-					});
-				});
+				console.log(`Cached: ${asset} (${progress})`);
 			}
 		})
 	);
diff --git a/src/resources/scripts/main.ts b/src/resources/scripts/main.ts
index 89beb2f..8bf3080 100644
--- a/src/resources/scripts/main.ts
+++ b/src/resources/scripts/main.ts
@@ -271,11 +271,10 @@ const serviceworker = {
 			window.addEventListener('load', () => {
 				navigator.serviceWorker.register('/service-worker.js').then(() => {
 					navigator.serviceWorker.addEventListener('message', (event) => {
-						if (event.data.title === 'sw-install-progress') {
-							// doesn't work bc inactive service worker cant claim client
-							console.log(`Service worker install: ${event.data.message} assets downloaded`);
-						} else if (event.data.title === 'sw-install-complete') {
-							alert('MineXLauncher is now ready for offline use!');
+						if (event.origin === window.location.origin) {
+							if (event.data.title === 'sw-install-complete') {
+								alert('MineXLauncher is now ready for offline use!');
+							}
 						}
 					});
 				});