successfully load and index 'plugins

Author: RohitKushvaha01

src/handlers/intent.js

@@ -1,4 +1,5 @@
 import fsOperation from "fileSystem";
+import internalFs from "fileSystem/internalFs";
 import openFile from "lib/openFile";
 import helpers from "utils/helpers";
 
@@ -32,7 +33,7 @@ export default async function HandleIntent(intent = {}) {
 
 			if (module === "plugin") {
 				const { default: Plugin } = await import("pages/plugin");
-				const installed = await fsOperation(PLUGIN_DIR, value).exists();
+				const installed = await internalFs.exists(PLUGIN_DIR);
 				Plugin({ id: value, installed, install: action === "install" });
 			}
 

src/lib/checkPluginsUpdate.js

@@ -3,7 +3,7 @@ import fsOperation from "../fileSystem";
 import Url from "../utils/Url";
 
 export default async function checkPluginsUpdate() {
-	const plugins = await fsOperation(PLUGIN_DIR).lsDir();
+	const plugins = await internalFs.listDir(PLUGIN_DIR);
 	const promises = [];
 	const updates = [];
 

src/lib/installPlugin.js

@@ -3,6 +3,7 @@ import alert from "dialogs/alert";
 import confirm from "dialogs/confirm";
 import loader from "dialogs/loader";
 import fsOperation from "fileSystem";
+import internalFs from "fileSystem/internalFs";
 import purchaseListener from "handlers/purchase";
 import JSZip from "jszip";
 import Url from "utils/Url";
@@ -42,8 +43,8 @@ export default async function installPlugin(
 	let state;
 
 	try {
-		if (!(await fsOperation(PLUGIN_DIR).exists())) {
-			await fsOperation(DATA_STORAGE).createDirectory("plugins");
+		if (!(await internalFs.exists(PLUGIN_DIR))) {
+			await internalFs.createDir(DATA_STORAGE, "plugins");
 		}
 	} catch (error) {
 		window.log("error", error);
@@ -181,12 +182,10 @@ export default async function installPlugin(
 			state = await InstallState.new(id);
 			console.log("Install state end");
 
-			if (!(await fsOperation(pluginDir).exists())) {
-				await fsOperation(PLUGIN_DIR).createDirectory(id);
+			if (!(await internalFs.exists(pluginDir))) {
+				await internalFs.createDir(PLUGIN_DIR, id);
 			}
 
-			console.log(zip);
-
 			const promises = Object.keys(zip.files).map(async (file) => {
 				try {
 					let correctFile = file;

src/lib/loadPlugins.js

@@ -1,3 +1,4 @@
+import internalFs from "fileSystem/internalFs";
 import fsOperation from "../fileSystem";
 import Url from "../utils/Url";
 import loadPlugin from "./loadPlugin";
@@ -24,7 +25,7 @@ const THEME_IDENTIFIERS = new Set([
 ]);
 
 export default async function loadPlugins(loadOnlyTheme = false) {
-	const plugins = await fsOperation(PLUGIN_DIR).lsDir();
+	const plugins = await internalFs.listDir(PLUGIN_DIR);
 	const results = [];
 	const failedPlugins = [];
 	const loadedPlugins = new Set();

src/pages/plugins/plugins.js

@@ -305,7 +305,7 @@ export default function PluginsInclude(updates) {
         hasMore = false;
       }
 
-      const installed = await fsOperation(PLUGIN_DIR).lsDir();
+      const installed = await internalFs.listDir(PLUGIN_DIR)
       installed.forEach(({ url }) => {
         const plugin = newPlugins.find(({ id }) => id === Url.basename(url));
         if (plugin) {
@@ -330,7 +330,7 @@ export default function PluginsInclude(updates) {
   async function getInstalledPlugins(updates) {
     $list.installed.setAttribute("empty-msg", strings["loading..."]);
     plugins.installed = [];
-    const installed = await fsOperation(PLUGIN_DIR).lsDir();
+    const installed = await internalFs.listDir(PLUGIN_DIR)
     await Promise.all(
       installed.map(async (item) => {
         const id = Url.basename(item.url);

src/sidebarApps/extensions/index.js

@@ -6,6 +6,7 @@ import Sidebar from "components/sidebar";
 import prompt from "dialogs/prompt";
 import select from "dialogs/select";
 import fsOperation from "fileSystem";
+import internalFs from "fileSystem/internalFs";
 import purchaseListener from "handlers/purchase";
 import constants from "lib/constants";
 import InstallState from "lib/installState";
@@ -301,18 +302,49 @@ async function loadExplore() {
 }
 
 async function listInstalledPlugins() {
+	let dirItems;
+
+	try {
+		dirItems = await internalFs.listDir(PLUGIN_DIR);
+	} catch (err) {
+		return [];
+	}
+
 	const plugins = await Promise.all(
-		(await fsOperation(PLUGIN_DIR).lsDir()).map(async (item) => {
-			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, plugin.icon);
-			plugin.icon = await helpers.toInternalUri(iconUrl);
+		dirItems.map(async (item, index) => {
+			let id, url;
+			try {
+				id = Url.basename(item.url);
+				url = Url.join(item.url, "plugin.json");
+			} catch (err) {
+				return null;
+			}
+
+			let plugin;
+			try {
+				plugin = await fsOperation(url).readFile("json");
+			} catch (err) {
+				console.error(err);
+				return null;
+			}
+
+			try {
+				const iconUrl = getLocalRes(id, plugin.icon);
+				plugin.icon = iconUrl;
+			} catch (err) {
+				plugin.icon = null;
+			}
+
 			plugin.installed = true;
+			plugin.id = id;
+			plugin.path = item.uri;
+
 			return plugin;
 		}),
 	);
-	return plugins;
+
+	const filteredPlugins = plugins.filter(Boolean);
+	return filteredPlugins;
 }
 
 async function getFilteredPlugins(filterName) {