From 365d5014d1a27ee7aab6019f383f75f905815751 Mon Sep 17 00:00:00 2001
From: zumbiepig <121742281+zumbiepig@users.noreply.github.com>
Date: Sun, 18 Aug 2024 21:19:07 -0700
Subject: [PATCH] done

---
 eslint.config.js                              | 12 ++++++++-
 public/index.html                             |  4 ++-
 .../scripts/eagler-launch/1.5.2/main.ts       |  1 -
 .../scripts/eagler-launch/1.8.8/main.ts       |  1 -
 .../scripts/eagler-launch/1.9.4/main.ts       |  1 -
 .../scripts/eagler-launch/b1.3/main.ts        |  1 -
 src/resources/scripts/google-tag.ts           |  1 -
 src/resources/scripts/main.ts                 | 25 +++++++------------
 src/resources/scripts/mods/mods.ts            |  2 +-
 src/resources/scripts/mods/resourcepacks.ts   |  2 +-
 src/resources/scripts/settings.ts             | 13 +++++-----
 11 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/eslint.config.js b/eslint.config.js
index 07b1e7f..633f77e 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,4 +1,14 @@
 import eslint from '@eslint/js';
 import tseslint from 'typescript-eslint';
 
-export default tseslint.config(eslint.configs.recommended, ...tseslint.configs.recommended);
+export default tseslint.config(eslint.configs.recommended, ...tseslint.configs.recommended, {
+	rules: {
+		'@typescript-eslint/ban-ts-comment': [
+			{
+				'ts-expect-error': false,
+        'ts-nocheck': false,
+				'ts-check': true,
+			},
+		],
+	},
+});
diff --git a/public/index.html b/public/index.html
index 2e9c939..944095c 100644
--- a/public/index.html
+++ b/public/index.html
@@ -24,9 +24,11 @@
 		<script src="/sw-register.js"></script>
 		<script src="/resources/scripts/main.js"></script>
 		<script>
-			const iframe = document.createElement('iframe');
 			const lastPage = storage.session.get('lastPage');
 			const isMobile = detect.mobile();
+			const iframe = document.createElement('iframe');
+
+			iframe.id = 'main_frame'
 
 			if (storage.local.get('lastVersion') === null) {
 				iframe.src = '/welcome.html';
diff --git a/src/resources/scripts/eagler-launch/1.5.2/main.ts b/src/resources/scripts/eagler-launch/1.5.2/main.ts
index 4b8dedc..8868446 100644
--- a/src/resources/scripts/eagler-launch/1.5.2/main.ts
+++ b/src/resources/scripts/eagler-launch/1.5.2/main.ts
@@ -1,4 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-nocheck
 window.addEventListener('load', function () {
 	const relayId = Math.floor(Math.random() * 3);
diff --git a/src/resources/scripts/eagler-launch/1.8.8/main.ts b/src/resources/scripts/eagler-launch/1.8.8/main.ts
index 6e6df37..0c633ea 100644
--- a/src/resources/scripts/eagler-launch/1.8.8/main.ts
+++ b/src/resources/scripts/eagler-launch/1.8.8/main.ts
@@ -1,4 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-nocheck
 window.addEventListener('load', () => {
 	const relayId = Math.floor(Math.random() * 3);
diff --git a/src/resources/scripts/eagler-launch/1.9.4/main.ts b/src/resources/scripts/eagler-launch/1.9.4/main.ts
index b2b113f..ede13ae 100644
--- a/src/resources/scripts/eagler-launch/1.9.4/main.ts
+++ b/src/resources/scripts/eagler-launch/1.9.4/main.ts
@@ -1,4 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-nocheck
 window.addEventListener('load', () => {
 	const relayId = Math.floor(Math.random() * 3);
diff --git a/src/resources/scripts/eagler-launch/b1.3/main.ts b/src/resources/scripts/eagler-launch/b1.3/main.ts
index 8e30c37..0f27acc 100644
--- a/src/resources/scripts/eagler-launch/b1.3/main.ts
+++ b/src/resources/scripts/eagler-launch/b1.3/main.ts
@@ -1,4 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-nocheck
 window.addEventListener('load', function () {
 	window.minecraftOpts = ['game_frame', 'assets.epk'];
diff --git a/src/resources/scripts/google-tag.ts b/src/resources/scripts/google-tag.ts
index ebdbb01..b5d318a 100644
--- a/src/resources/scripts/google-tag.ts
+++ b/src/resources/scripts/google-tag.ts
@@ -1,4 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-nocheck
 const script = document.createElement('script');
 script.async = true;
diff --git a/src/resources/scripts/main.ts b/src/resources/scripts/main.ts
index 8f58c6c..c2c1042 100644
--- a/src/resources/scripts/main.ts
+++ b/src/resources/scripts/main.ts
@@ -1,13 +1,5 @@
-interface BeforeInstallPromptEvent extends Event {
-	readonly platforms: string[];
-	readonly userChoice: Promise<{ outcome: 'accepted' | 'dismissed'; platform: string }>;
-	prompt(): Promise<{ outcome: 'accepted' | 'dismissed'; platform: string }>;
-}
-
 let selectedVersion: string | undefined;
 const launcherVersion = '1.5';
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-let installPwaEvent: BeforeInstallPromptEvent;
 
 const theme = {
 	load: function (themeToLoad?: string) {
@@ -59,10 +51,10 @@ const versionSelector = {
 const game = {
 	play: function (version?: string) {
 		if (version) {
-			// @ts-expect-error 123
+			// @ts-expect-error
 			window.top.location.href = version;
 		} else if (selectedVersion) {
-			// @ts-expect-error 123
+			// @ts-expect-error
 			window.top.location.href = selectedVersion;
 		} else {
 			alert('Please select a version to play.');
@@ -173,7 +165,7 @@ const cookie = {
 		for (const cookie of document.cookie.split('; ')) {
 			const cookiePair = cookie.split('=');
 			if (encodeURIComponent(key) === cookiePair[0]) {
-				// @ts-expect-error 123
+				// @ts-expect-error
 				return decodeURIComponent(cookiePair[1]);
 			}
 		}
@@ -275,13 +267,14 @@ const detect = {
 
 if (window.location.pathname === '/') {
 	window.addEventListener('beforeinstallprompt', (event) => {
-		installPwaEvent = event as BeforeInstallPromptEvent;
+		const mainFrame = document.getElementById('main_frame') as HTMLIFrameElement;
+		if (mainFrame.contentWindow) {
+			// @ts-expect-error
+			mainFrame.contentWindow.installPwaEvent = event;
+		}
 	});
 } else {
 	document.addEventListener('DOMContentLoaded', () => {
-		// @ts-expect-error 123
-		delete window.installPwaEvent;
-
 		const profileName = document.getElementById('profile-name');
 		if (profileName) {
 			profileName.textContent = storage.local.get('username');
@@ -306,4 +299,4 @@ if (detect.mobile()) {
 	link.href = '/resources/styles/mobile.css';
 	document.head.appendChild(link);
 }
-theme.load();
\ No newline at end of file
+theme.load();
diff --git a/src/resources/scripts/mods/mods.ts b/src/resources/scripts/mods/mods.ts
index 10ae5dd..658cc43 100644
--- a/src/resources/scripts/mods/mods.ts
+++ b/src/resources/scripts/mods/mods.ts
@@ -3,7 +3,7 @@ document.addEventListener('DOMContentLoaded', async () => {
 	const data = await response.json();
 	const modListElement = document.querySelector('.mod-list');
 
-	// @ts-expect-error 123
+	// @ts-expect-error
 	data.mods.forEach(({ id, name, description, author, authorLink, source }) => {
 		const div = document.createElement('div');
 		div.classList.add('mod-item');
diff --git a/src/resources/scripts/mods/resourcepacks.ts b/src/resources/scripts/mods/resourcepacks.ts
index 0431a22..a803935 100644
--- a/src/resources/scripts/mods/resourcepacks.ts
+++ b/src/resources/scripts/mods/resourcepacks.ts
@@ -3,7 +3,7 @@ document.addEventListener('DOMContentLoaded', async () => {
 	const data = await response.json();
 	const modListElement = document.querySelector('.mod-list');
 
-	// @ts-expect-error 123
+	// @ts-expect-error
 	data.resourcepacks.forEach(({ id, name, description, author, authorLink, source }) => {
 		const div = document.createElement('div');
 		div.classList.add('mod-item');
diff --git a/src/resources/scripts/settings.ts b/src/resources/scripts/settings.ts
index f9c4871..a7196cf 100644
--- a/src/resources/scripts/settings.ts
+++ b/src/resources/scripts/settings.ts
@@ -53,16 +53,15 @@ if (window.location.pathname === '/welcome.html') {
 				while (username.length < 3) {
 					username += '_';
 				}
+
 				storage.local.set('username', username);
 				storage.local.set('theme', themeSelect.value);
 				storage.local.set('lastVersion', launcherVersion);
-				try {
-					// @ts-expect-error 123
-					window.top?.installPwaEvent.prompt();
-				} catch (error) {
-					console.warn('Failed to prompt PWA install:', error);
-				}
-				// @ts-expect-error 123
+
+				// @ts-expect-error
+				installPwaEvent?.prompt();
+
+				// @ts-expect-error
 				window.top.location.href = '/';
 			}
 		});