fix. infinite loading when installing plugin

Author: RohitKushvaha01

src/fileSystem/internalFs.js

@@ -32,8 +32,6 @@ const internalFs = {
 							mtime: file.mtime,
 							isFile: file.type === "file",
 							isDirectory: file.type === "directory",
-							// TODO: Link(symlink/hardlink) file detection if possible.
-              //This function sometimes gets called even before the NativeLayer is registred so calling isSymlink is not possible
 							isLink: false,
 						})),
 					);

src/lib/installPlugin.js

@@ -65,11 +65,11 @@ export default async function installPlugin(
 		pluginUrl = id;
 	}
 
-	console.log(`Plugin Url ${pluginUrl}`);
-
 	try {
 		if (!isDependency) loaderDialog.show();
 
+		console.log("installing ...");
+
 		let plugin;
 		if (
 			pluginUrl.includes(constants.API_BASE) ||
@@ -97,9 +97,11 @@ export default async function installPlugin(
 					(response) => {
 						resolve(response.data);
 						loaderDialog.setMessage(`${strings.loading} 100%`);
+						console.log("Download complete");
 					},
 					(error) => {
 						reject(error);
+						console.log("Download failed");
 					},
 				);
 			});
@@ -108,15 +110,19 @@ export default async function installPlugin(
 		if (plugin) {
 			const zip = new JSZip();
 			await zip.loadAsync(plugin);
+			console.log("Plugin zip loaded into memory");
 
 			if (!zip.files["plugin.json"]) {
 				throw new Error(strings["invalid plugin"]);
 			}
 
+			console.log("Plugin Json start");
+			const jsonStr = await zip.files["plugin.json"].async("text");
+			console.log(jsonStr);
+			console.log("Plugin json end");
+
 			/** @type {{ dependencies: string[] }} */
-			const pluginJson = JSON.parse(
-				await zip.files["plugin.json"].async("text"),
-			);
+			const pluginJson = JSON.parse(jsonStr);
 
 			/** patch main in manifest */
 			if (!zip.files[pluginJson.main]) {
@@ -171,20 +177,27 @@ export default async function installPlugin(
 				pluginDir = Url.join(PLUGIN_DIR, id);
 			}
 
+			console.log("Begin Install state");
 			state = await InstallState.new(id);
+			console.log("Install state end");
 
 			if (!(await fsOperation(pluginDir).exists())) {
 				await fsOperation(PLUGIN_DIR).createDirectory(id);
 			}
 
+			console.log(zip);
+
 			const promises = Object.keys(zip.files).map(async (file) => {
 				try {
 					let correctFile = file;
+
 					if (/\\/.test(correctFile)) {
 						correctFile = correctFile.replace(/\\/g, "/");
 					}
 
+					console.log(`Correct file ${correctFile}`);
 					const fileUrl = Url.join(pluginDir, correctFile);
+					console.log("file Url " + fileUrl);
 
 					if (!state.exists(correctFile)) {
 						await createFileRecursive(pluginDir, correctFile);
@@ -200,7 +213,9 @@ export default async function installPlugin(
 					}
 
 					if (!(await state.isUpdated(correctFile, data))) return;
+					console.log("writing file");
 					await fsOperation(fileUrl).writeFile(data);
+					console.log("file written");
 					return;
 				} catch (error) {
 					console.error(`Error processing file ${file}:`, error);
@@ -210,17 +225,27 @@ export default async function installPlugin(
 			// Wait for all files to be processed
 			await Promise.allSettled(promises);
 
+			console.log("done");
+
 			if (isDependency) {
 				depsLoaders.push(async () => {
 					await loadPlugin(id, true);
 				});
 			} else {
+				console.log("loaders");
 				for (const loader of depsLoaders) {
+					console.log("loading loader");
+					console.log(loader);
 					await loader();
 				}
+				console.log("loader loading done");
+				console.log("loading plugin");
 				await loadPlugin(id, true);
+				console.log("loading plugin done");
 			}
 
+			console.log("successfully loaded");
+
 			await state.save();
 			deleteRedundantFiles(pluginDir, state);
 		}

src/lib/installState.js

@@ -25,7 +25,11 @@ export default class InstallState {
 			}
 
 			state.storeUrl = Url.join(INSTALL_STATE_STORAGE, state.id);
-			if (await fsOperation(state.storeUrl).exists()) {
+
+			console.log("store url");
+			console.log(state.storeUrl);
+
+			if ((await fsOperation(state.storeUrl).exists()) && false) {
 				state.store = JSON.parse(
 					await fsOperation(state.storeUrl).readFile("utf-8"),
 				);
@@ -41,6 +45,10 @@ export default class InstallState {
 				await fsOperation(INSTALL_STATE_STORAGE).createFile(state.id);
 			}
 
+			await fsOperation(state.storeUrl).delete();
+			console.log("returned state");
+			console.log(state);
+
 			return state;
 		} catch (e) {
 			console.error(e);

src/lib/loadPlugin.js

@@ -25,26 +25,45 @@ export default async function loadPlugin(pluginId, justInstalled = false) {
 		mainUrl = Url.join(baseUrl, "main.js");
 	}
 
-	return new Promise((resolve, reject) => {
+	console.log(`main url ${mainUrl}`);
+
+	return new Promise(async (resolve, reject) => {
 		if (pluginId === undefined) {
 			console.error("Skipping loading plugin with undefined id");
 			reject("Skipping loading plugin with undefined id");
 			return;
 		}
 
-		const data = internalFs.readStringFile(mainUrl).data;
+		const result = await internalFs.readStringFile(mainUrl);
+
+		console.log(`result ${result}`);
+
+		const data = result.data;
+
+		console.log(`data ${data}`);
+
+		const blob = new Blob([data], { type: "text/javascript" });
+		const url = URL.createObjectURL(blob);
 
-		const $script = <script dangerouslySetInnerHTML={{ __html: data }} />;
+		const $script = document.createElement("script");
+		$script.src = url;
+		$script.type = "text/javascript";
+
+		console.log("script created");
 
 		$script.onerror = (error) => {
+			URL.revokeObjectURL(url);
 			reject(
 				new Error(
 					`Failed to load script for plugin ${pluginId}: ${error.message || error}`,
 				),
 			);
 		};
 
+		console.log("on error registered");
+
 		$script.onload = async () => {
+			URL.revokeObjectURL(url);
 			const $page = Page("Plugin");
 			$page.show = () => {
 				actionStack.push({
@@ -60,6 +79,7 @@ export default async function loadPlugin(pluginId, justInstalled = false) {
 			};
 
 			try {
+				console.log("trying");
 				if (!(await fsOperation(cacheFile).exists())) {
 					await fsOperation(CACHE_STORAGE).createFile(pluginId);
 				}
@@ -70,12 +90,18 @@ export default async function loadPlugin(pluginId, justInstalled = false) {
 					firstInit: justInstalled,
 				});
 
+				console.log("done xx");
+
 				resolve();
 			} catch (error) {
 				reject(error);
 			}
 		};
 
+		console.log("on load registred");
+
+		console.log("attaching script");
 		document.head.append($script);
+		console.log("script attached");
 	});
 }