fix: Acode ignoring main, readme and icon fields in plugin manifest (#1085)

* fix: Acode ignoring main, readme and icon fields in plugin manifest

* removed hardcoded values, used manifest file values

* Update installPlugin.js

* Update loadPlugin.js

* removed fs test for plugin.main, use try/catch instead

* Revert "removed fs test for plugin.main, use try/catch instead"

This reverts commit 1ff70a5.

Author: alMukaafih

src/lib/installPlugin.js

@@ -101,7 +101,7 @@ export default async function installPlugin(
 			const zip = new JSZip();
 			await zip.loadAsync(plugin);
 
-			if (!zip.files["plugin.json"] || !zip.files["main.js"]) {
+			if (!zip.files["plugin.json"]) {
 				throw new Error(strings["invalid plugin"]);
 			}
 
@@ -110,6 +110,25 @@ export default async function installPlugin(
 				await zip.files["plugin.json"].async("text"),
 			);
 
+			/** patch main in manifest */
+			if (!zip.files[pluginJson.main]) {
+				pluginJson.main = "main.js";
+			}
+
+			/** patch icon in manifest */
+			if (!zip.files[pluginJson.icon]) {
+				pluginJson.icon = "icon.png";
+			}
+
+			/** patch readme in manifest */
+			if (!zip.files[pluginJson.readme]) {
+				pluginJson.readme = "readme.md";
+			}
+
+			if (!zip.files[pluginJson.main]) {
+				throw new Error(strings["invalid plugin"]);
+			}
+
 			if (!isDependency && pluginJson.dependencies) {
 				const manifests = await resolveDepsManifest(pluginJson.dependencies);
 

src/lib/loadPlugin.js

@@ -8,8 +8,21 @@ export default async function loadPlugin(pluginId, justInstalled = false) {
 	const baseUrl = await helpers.toInternalUri(Url.join(PLUGIN_DIR, pluginId));
 	const cacheFile = Url.join(CACHE_STORAGE, pluginId);
 
+	const pluginJson = await fsOperation(
+		Url.join(PLUGIN_DIR, pluginId, "plugin.json"),
+	).readFile("json");
+
+	let mainUrl;
+	if (
+		await fsOperation(Url.join(PLUGIN_DIR, pluginId, pluginJson.main)).exists()
+	) {
+		mainUrl = Url.join(baseUrl, pluginJson.main);
+	} else {
+		mainUrl = Url.join(baseUrl, "main.js");
+	}
+
 	return new Promise((resolve, reject) => {
-		const $script = <script src={Url.join(baseUrl, "main.js")}></script>;
+		const $script = <script src={mainUrl}></script>;
 
 		$script.onerror = (error) => {
 			reject(

src/pages/plugin/plugin.js

@@ -77,7 +77,7 @@ export default async function PluginInclude(
 			).readFile("json");
 			const { author } = installedPlugin;
 			const description = await fsOperation(
-				Url.join(PLUGIN_DIR, id, "readme.md"),
+				Url.join(PLUGIN_DIR, id, installedPlugin.readme),
 			).readFile("utf8");
 			let changelogs = "";
 			if (installedPlugin.changelogs) {
@@ -93,7 +93,7 @@ export default async function PluginInclude(
 			}
 
 			const iconUrl = await helpers.toInternalUri(
-				Url.join(PLUGIN_DIR, id, "icon.png"),
+				Url.join(PLUGIN_DIR, id, installedPlugin.icon),
 			);
 			const iconData = await fsOperation(iconUrl).readFile();
 			const icon = URL.createObjectURL(

src/pages/plugins/plugins.js

@@ -337,7 +337,7 @@ export default function PluginsInclude(updates) {
         if (!((updates && updates.includes(id)) || !updates)) return;
         const url = Url.join(item.url, "plugin.json");
         const plugin = await fsOperation(url).readFile("json");
-        const iconUrl = getLocalRes(id, "icon.png");
+        const iconUrl = getLocalRes(id, plugin.icon);
         plugin.icon = await helpers.toInternalUri(iconUrl);
         plugin.installed = true;
         plugins.installed.push(plugin);

src/sidebarApps/extensions/index.js

@@ -306,7 +306,7 @@ async function listInstalledPlugins() {
 			const id = Url.basename(item.url);
 			const url = Url.join(item.url, "plugin.json");
 			const plugin = await fsOperation(url).readFile("json");
-			const iconUrl = getLocalRes(id, "icon.png");
+			const iconUrl = getLocalRes(id, plugin.icon);
 			plugin.icon = await helpers.toInternalUri(iconUrl);
 			plugin.installed = true;
 			return plugin;