From 3e382d952a3db811c0efec8b77d708672208b905 Mon Sep 17 00:00:00 2001
From: Nam Anh <phamnamanh25@gmail.com>
Date: Sun, 25 Aug 2024 17:58:33 +0700
Subject: [PATCH 1/2] fix(wrapper): wait until all modules loaded (#3143)

---
 jsHelper/spicetifyWrapper.js | 55 ++++++++++++++++++++++++++++++------
 1 file changed, 46 insertions(+), 9 deletions(-)

diff --git a/jsHelper/spicetifyWrapper.js b/jsHelper/spicetifyWrapper.js
index d9476c3ef6..f8df3ff4b5 100644
--- a/jsHelper/spicetifyWrapper.js
+++ b/jsHelper/spicetifyWrapper.js
@@ -185,6 +185,7 @@ window.Spicetify = {
 					"ContextMenuV2",
 					"ReactJSX",
 					"_renderNavLinks",
+					"Events",
 				]),
 			},
 			{
@@ -347,7 +348,7 @@ window.Spicetify = {
 	if (Spicetify.Events.platformLoaded.callbacks.length) Spicetify.Events.platformLoaded.fire();
 })();
 
-(function addProxyCosmos() {
+(async function addProxyCosmos() {
 	if (!Spicetify.Player.origin?._cosmos && !Spicetify.Platform?.Registry) {
 		setTimeout(addProxyCosmos, 50);
 		return;
@@ -436,6 +437,7 @@ window.Spicetify = {
 		},
 	};
 
+	while (!Spicetify.Player.origin) await new Promise((r) => setTimeout(r, 50));
 	Spicetify.Player.origin._cosmos = new Proxy(_cosmos, handler);
 	Object.defineProperty(Spicetify, "CosmosAsync", {
 		get: () => {
@@ -444,19 +446,54 @@ window.Spicetify = {
 	});
 })();
 
-(function hotloadWebpackModules() {
+(async function hotloadWebpackModules() {
 	if (!window?.webpackChunkclient_web) {
-		setTimeout(hotloadWebpackModules, 50);
+		await new Promise((r) => setTimeout(r, 50));
 		return;
 	}
+
 	// Force all webpack modules to load
 	const require = webpackChunkclient_web.push([[Symbol()], {}, (re) => re]);
-	const chunks = require.m ? Object.entries(require.m) : [];
-	if (!chunks) {
-		setTimeout(hotloadWebpackModules, 50);
-		return;
-	}
-	const cache = Object.keys(require.m).map((id) => require(id));
+	while (!require.m) await new Promise((r) => setTimeout(r, 50));
+
+	let chunks = Object.entries(require.m);
+	let cache = Object.keys(require.m).map((id) => require(id));
+
+	// For _renderNavLinks to work
+	Spicetify.React = cache.find((m) => m?.useMemo);
+
+	// Get all script tags matching root directory
+	// Some link tags modules are not included in require.m/unused
+	const scripts = [...document.querySelectorAll("script")]
+		// Get scripts from root dir
+		.filter((script) => script.src?.includes("xpui.app.spotify.com"))
+		// Filter out non-webpack scripts
+		.filter((script) => ["extensions", "spicetify", "helper", "theme"].every((str) => !script.src?.includes(str)));
+
+	await Promise.all(
+		scripts.map(async (script) => {
+			try {
+				const res = await fetch(script.src);
+				const text = await res.text();
+				const src = script.src.split("/").pop();
+				console.log(`[spicetifyWrapper] Waiting for ${src}`);
+				for (const pack of text.match(/(?:,|{)(\d+): ?\(.,.,./g).map((str) => str.slice(0, -7).slice(1))) {
+					// console.debug(`[spicetifyWrapper] Waiting for ${pack} of ${src}`);
+					while (!require.m || !Object.keys(require.m).includes(pack)) {
+						await new Promise((r) => setTimeout(r, 100));
+					}
+				}
+				console.log(`[spicetifyWrapper] Loaded ${src}`);
+			} catch (e) {
+				return console.error(e);
+			}
+		})
+	).then(() => {
+		console.log("[spicetifyWrapper] All required webpack modules loaded");
+		chunks = Object.entries(require.m);
+		cache = Object.keys(require.m).map((id) => require(id));
+	});
+
 	const modules = cache
 		.filter((module) => typeof module === "object")
 		.flatMap((module) => {

From 5cee0d43569f04390e0f88a0a910448cfe43b86e Mon Sep 17 00:00:00 2001
From: ririxi <dev@ririxi.dev>
Date: Sun, 25 Aug 2024 14:55:20 +0200
Subject: [PATCH 2/2] fix(wrapper/webpack): do not return while webpack is
 loading

---
 jsHelper/spicetifyWrapper.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/jsHelper/spicetifyWrapper.js b/jsHelper/spicetifyWrapper.js
index f8df3ff4b5..89b90c5d0c 100644
--- a/jsHelper/spicetifyWrapper.js
+++ b/jsHelper/spicetifyWrapper.js
@@ -447,9 +447,8 @@ window.Spicetify = {
 })();
 
 (async function hotloadWebpackModules() {
-	if (!window?.webpackChunkclient_web) {
+	while (!window?.webpackChunkclient_web) {
 		await new Promise((r) => setTimeout(r, 50));
-		return;
 	}
 
 	// Force all webpack modules to load