node-pluginsmanager 2.3.4 → 2.3.7

package/lib/cmd/git/install.js

@@ -40,7 +40,7 @@ module.exports = function gitinstall (directory, user, repo) {
 			"--recursive",
 			"--depth",
 			"1",
-			"git://github.com/" + user + "/" + repo + ".git",
+			"https://github.com/" + user + "/" + repo + "/",
 			directory
 		]);
 

package/lib/initSortedPlugins.js

@@ -1,7 +1,3 @@
-/*
-	eslint max-params: 0
-*/
-
 "use strict";
 
 // private
@@ -31,22 +27,22 @@
 
 		/**
 		* Load plugins with sort conditions
-		* @param {object} toLoad : plugins to init
+		* @param {object} pluginsToInit : plugins to init
 		* @param {function} emit : emit data function
 		* @param {object} data : data to send
 		* @param {number} i : stepper
 		* @return {Promise} : result operation
 		*/
-		function _initSortedPlugins (toLoad, emit, data, i = 0) {
+		function _initPlugins (pluginsToInit, emit, data, i = 0) {
 
-			return i < toLoad.length ? Promise.resolve().then(() => {
+			return i < pluginsToInit.length ? Promise.resolve().then(() => {
 
-				return _initPlugin(toLoad[i], emit, data);
+				return _initPlugin(pluginsToInit[i], emit, data);
 
 			// loop
 			}).then(() => {
 
-				return _initSortedPlugins(toLoad, emit, data, i + 1);
+				return _initPlugins(pluginsToInit, emit, data, i + 1);
 
 			}) : Promise.resolve();
 
@@ -54,30 +50,46 @@
 
 // module
 
-module.exports = (plugins, orderedPluginsNames, emit, data) => {
+module.exports = function initSortedPlugins (plugins, orderedPluginsNames, emit, data) {
 
 	// if no plugins, does not run
 	return !plugins.length ? Promise.resolve() : Promise.resolve().then(() => {
 
-		// first, sorted plugins
-		return _initSortedPlugins(orderedPluginsNames.map((pluginName) => {
-
-			return plugins.find((plugin) => {
-				return plugin.name === pluginName;
-			});
+		const sortedPlugins = [
+			...plugins.filter((plugin) => {
+				return orderedPluginsNames.includes(plugin.name);
+			})
+		];
 
-		}), emit, data);
+		// first, sorted plugins
+		return sortedPlugins.length ?
+			_initPlugins(sortedPlugins, emit, data) :
+			Promise.resolve();
 
 	}).then(() => {
 
-		// then, all other plugins, asynchronously
-		return Promise.all(plugins.filter((plugin) => {
-			return !orderedPluginsNames.includes(plugin.name);
-		}).map((plugin) => {
+		const unsortedPlugin = [
+			...plugins.filter((plugin) => {
+				return !orderedPluginsNames.includes(plugin.name);
+			}).sort((a, b) => {
 
-			return _initPlugin(plugin, emit, data);
+				if (a < b) {
+					return -1;
+				}
+				else if (a > b) {
+					return 1;
+				}
+				else {
+					return 0;
+				}
 
-		}));
+			})
+		];
+
+		// then, all other plugins, asynchronously
+		return unsortedPlugin.length ?
+			_initPlugins(unsortedPlugin, emit, data) :
+			Promise.resolve();
 
 	});
 

package/lib/loadSortedPlugins.js

@@ -20,26 +20,26 @@
 		* Load plugins with sort conditions
 		* @param {string} globalDirectory : get plugins directory
 		* @param {string} externalRessourcesDirectory : get ressources directory
-		* @param {string} pluginName : get ressources directory
-		* @param {object} plugins : already loaded plugins
+		* @param {string} pluginFileName : get ressources directory
+		* @param {object} loadedPlugins : already loaded plugins
 		* @param {function} emit : emit data function
 		* @param {function|null} logger : if logger, send it to plugin
 		* @param {object} data : data to send
 		* @return {Promise} : result operation
 		*/
-		function _loadPlugin (globalDirectory, externalRessourcesDirectory, pluginName, plugins, emit, logger, data) {
+		function _loadPlugin (globalDirectory, externalRessourcesDirectory, pluginFileName, loadedPlugins, emit, logger, data) {
 
 			// is already loaded ?
-			const plugin = plugins.find((p) => {
-				return pluginName === p.name;
+			const plugin = loadedPlugins.find((p) => {
+				return pluginFileName === p.name;
 			});
 
 			// is already exists ?
 			return plugin ? Promise.resolve() : Promise.resolve().then(() => {
 
-				emit("loading", pluginName, data);
+				emit("loading", pluginFileName, data);
 
-				const directory = join(globalDirectory, pluginName);
+				const directory = join(globalDirectory, pluginFileName);
 
 				return createPluginByDirectory(directory, externalRessourcesDirectory, logger, data);
 
@@ -47,7 +47,7 @@
 			}).then((createdPlugin) => {
 
 				emit("loaded", createdPlugin, data);
-				plugins.push(createdPlugin);
+				loadedPlugins.push(createdPlugin);
 
 				return Promise.resolve();
 
@@ -59,24 +59,24 @@
 		* Load plugins with sort conditions
 		* @param {string} globalDirectory : get plugins directory
 		* @param {string} externalRessourcesDirectory : get ressources directory
-		* @param {Array} toLoad : plugins to load
-		* @param {object} plugins : already loaded plugins
+		* @param {Array} pluginsToLoad : plugins to load
+		* @param {object} loadedPlugins : already loaded plugins
 		* @param {function} emit : emit data function
 		* @param {function|null} logger : if logger, send it to plugin
 		* @param {object} data : data to send
 		* @param {number} i : stepper
 		* @return {Promise} : result operation
 		*/
-		function _loadSortedPlugins (globalDirectory, externalRessourcesDirectory, toLoad, plugins, emit, logger, data, i = 0) {
+		function _loadPlugins (globalDirectory, externalRessourcesDirectory, pluginsToLoad, loadedPlugins, emit, logger, data, i = 0) {
 
-			return i < toLoad.length ? Promise.resolve().then(() => {
+			return i < pluginsToLoad.length ? Promise.resolve().then(() => {
 
-				return _loadPlugin(globalDirectory, externalRessourcesDirectory, toLoad[i], plugins, emit, logger, data);
+				return _loadPlugin(globalDirectory, externalRessourcesDirectory, pluginsToLoad[i], loadedPlugins, emit, logger, data);
 
 			// loop
 			}).then(() => {
 
-				return _loadSortedPlugins(globalDirectory, externalRessourcesDirectory, toLoad, plugins, emit, logger, data, i + 1);
+				return _loadPlugins(globalDirectory, externalRessourcesDirectory, pluginsToLoad, loadedPlugins, emit, logger, data, i + 1);
 
 			}) : Promise.resolve();
 
@@ -84,24 +84,48 @@
 
 // module
 
-module.exports = (globalDirectory, externalRessourcesDirectory, files, plugins, orderedPluginsNames, emit, logger, data) => {
+module.exports = function loadSortedPlugins (
+	globalDirectory, externalRessourcesDirectory, files, loadedPlugins, orderedPluginsNames, emit, logger, data
+) {
 
 	// if no files, does not run
 	return !files.length ? Promise.resolve() : Promise.resolve().then(() => {
 
+		const sortedPluginsNames = [
+			...files.filter((pluginName) => {
+				return orderedPluginsNames.includes(pluginName);
+			})
+		];
+
 		// first, sorted plugins
-		return _loadSortedPlugins(globalDirectory, externalRessourcesDirectory, orderedPluginsNames, plugins, emit, logger, data);
+		return sortedPluginsNames.length ?
+			_loadPlugins(globalDirectory, externalRessourcesDirectory, sortedPluginsNames, loadedPlugins, emit, logger, data) :
+			Promise.resolve();
 
 	}).then(() => {
 
-		// then, all other plugins, asynchronously
-		return Promise.all(files.filter((pluginName) => {
-			return !orderedPluginsNames.includes(pluginName);
-		}).map((file) => {
+		const unsortedPluginsNames = [
+			...files.filter((pluginName) => {
+				return !orderedPluginsNames.includes(pluginName);
+			}).sort((a, b) => {
 
-			return _loadPlugin(globalDirectory, externalRessourcesDirectory, file, plugins, emit, logger, data);
+				if (a < b) {
+					return -1;
+				}
+				else if (a > b) {
+					return 1;
+				}
+				else {
+					return 0;
+				}
 
-		}));
+			})
+		];
+
+		// then, all other plugins, asynchronously
+		return unsortedPluginsNames.length ?
+		_loadPlugins(globalDirectory, externalRessourcesDirectory, unsortedPluginsNames, loadedPlugins, emit, logger, data) :
+			Promise.resolve();
 
 	});
 

package/lib/main.js

@@ -77,7 +77,7 @@ module.exports = class PluginsManager extends Events {
 
 			getPluginsNames () {
 
-				return this.plugins.map((plugin) => {
+				return [ ...this.plugins ].map((plugin) => {
 					return plugin.name;
 				});
 
@@ -118,6 +118,12 @@ module.exports = class PluginsManager extends Events {
 
 			}
 
+			getOrder () {
+
+				return [ ...this._orderedPluginsNames ];
+
+			}
+
 		// checkers
 
 			checkAllModules () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-pluginsmanager",
-  "version": "2.3.4",
+  "version": "2.3.7",
   "description": "A plugins manager",
   "main": "lib/main.js",
   "typings": "lib/index.d.ts",
@@ -39,18 +39,18 @@
     "node-promfs": "3.7.0"
   },
   "devDependencies": {
-    "@types/node": "16.11.7",
+    "@types/node": "17.0.31",
     "@types/socket.io": "3.0.2",
-    "@types/ws": "8.2.0",
+    "@types/ws": "8.5.3",
     "coveralls": "3.1.1",
-    "eslint": "8.2.0",
-    "express": "4.17.1",
-    "husky": "7.0.4",
-    "mocha": "9.1.3",
-    "node-pluginsmanager-plugin": "4.7.2",
+    "eslint": "8.15.0",
+    "express": "4.18.1",
+    "husky": "8.0.1",
+    "mocha": "10.0.0",
+    "node-pluginsmanager-plugin": "4.8.4",
     "nyc": "15.1.0",
-    "typescript": "4.4.4",
-    "ws": "8.2.3"
+    "typescript": "4.6.4",
+    "ws": "8.6.0"
   },
   "homepage": "https://github.com/Psychopoulet/node-pluginsmanager#readme",
   "engines": {