node-pluginsmanager 3.6.1 → 3.6.2

package/lib/cjs/PluginsManager.js

@@ -25,7 +25,6 @@ const isFile_1 = __importDefault(require("./utils/isFile"));
 const createPluginByDirectory_1 = __importDefault(require("./createPluginByDirectory"));
 const loadSortedPlugins_1 = __importDefault(require("./loadSortedPlugins"));
 const initSortedPlugins_1 = __importDefault(require("./initSortedPlugins"));
-const extractGithub_1 = __importDefault(require("./utils/extractGithub"));
 const getLatestGithubTag_1 = __importDefault(require("./utils/getLatestGithubTag"));
 const parseGithubUserRepo_1 = __importDefault(require("./utils/parseGithubUserRepo"));
 // git
@@ -223,7 +222,7 @@ class PluginsManager extends node_events_1.default {
     // after releasing, destroy packages data & free "plugins" list, using "data" in arguments for "destroy" plugin's Orchestrator method
     destroyAll(...data) {
         return Promise.all(this.plugins.map((plugin) => {
-            return plugin.destroy().then(() => {
+            return plugin.destroy(...data).then(() => {
                 this.emit("destroyed", plugin.name, ...data);
             });
         })).then(() => {
@@ -272,7 +271,7 @@ class PluginsManager extends node_events_1.default {
     }
     getLatestGithubTag(plugin) {
         return (0, checkOrchestrator_1.default)("getLatestGithubTag/plugin", plugin).then(() => {
-            const githubUserRepo = (0, parseGithubUserRepo_1.default)((0, extractGithub_1.default)(plugin));
+            const githubUserRepo = (0, parseGithubUserRepo_1.default)(plugin.repository);
             if (!githubUserRepo) {
                 throw new Error("Plugin \"" + plugin.name + "\" has an invalid github project link");
             }
@@ -414,45 +413,46 @@ class PluginsManager extends node_events_1.default {
     updateViaGithub(plugin, ...data) {
         let directory = "";
         let key = -1;
+        let pluginName = "";
         // check plugin
         return (0, checkOrchestrator_1.default)("updateViaGithub/plugin", plugin).then(() => {
-            key = this.getPluginsNames().findIndex((pluginName) => {
-                return pluginName === plugin.name;
+            pluginName = plugin.name;
+            key = this.getPluginsNames().findIndex((pn) => {
+                return pluginName === pn;
             });
             if (-1 >= key) {
-                throw new Error("Plugin \"" + plugin.name + "\" is not registered");
+                throw new Error("Plugin \"" + pluginName + "\" is not registered");
             }
             // check plugin directory
         }).then(() => {
             return (0, checkAbsoluteDirectory_1.default)("updateViaGithub/directory", this.directory).then(() => {
-                directory = (0, node_path_1.join)(this.directory, plugin.name);
+                directory = (0, node_path_1.join)(this.directory, pluginName);
                 return (0, checkAbsoluteDirectory_1.default)("updateViaGithub/plugindirectory", directory);
             });
             // check remote version
         }).then(() => {
             const currentVersion = semver_1.default.coerce(plugin.version);
             if (!currentVersion) {
-                throw new Error("Plugin \"" + plugin.name + "\" has no valid version (\"" + plugin.version + "\")");
+                throw new Error("Plugin \"" + pluginName + "\" has no valid version (\"" + plugin.version + "\")");
             }
-            this._logger?.("debug", "Get github latest tag", false, plugin.name);
+            this._logger?.("debug", "Get github latest tag", false, pluginName);
             return this.getLatestGithubTag(plugin).then((tag) => {
                 const latestVersion = semver_1.default.coerce(tag);
                 if (!latestVersion) {
-                    throw new Error("No valid version found for plugin \"" + plugin.name + "\" on github");
+                    throw new Error("No valid version found for plugin \"" + pluginName + "\" on github");
                 }
-                this._logger?.("debug", "Compare local version with github lastest tag", false, plugin.name);
+                this._logger?.("debug", "Compare local version with github latest tag", false, pluginName);
                 if (!semver_1.default.gt(latestVersion, currentVersion)) {
-                    throw new Error("Plugin \"" + plugin.name + "\" is already up to date (v" + plugin.version + ")");
+                    throw new Error("Plugin \"" + pluginName + "\" is already up to date (v" + plugin.version + ")");
                 }
-                this._logger?.("success", "New version available", false, plugin.name);
+                this._logger?.("success", "New version available", false, pluginName);
                 return tag;
             });
             // release plugin
         }).then((latestTag) => {
-            const pluginName = plugin.name;
             return plugin.release(...data).then(() => {
                 this.emit("released", plugin, ...data);
-                return plugin.destroy();
+                return plugin.destroy(...data);
             }).then(() => {
                 this.emit("destroyed", pluginName, ...data);
                 this.plugins.splice(key, 1);
@@ -460,13 +460,13 @@ class PluginsManager extends node_events_1.default {
             });
             // update plugin
         }).then((latestTag) => {
-            this._logger?.("debug", "Update with new plugin version", false, plugin.name);
+            this._logger?.("debug", "Update with new plugin version", false, pluginName);
             return (0, gitUpdate_1.default)(directory, latestTag).then(() => {
                 return (0, createPluginByDirectory_1.default)(directory, this.externalResourcesDirectory, this._logger, ...data);
             });
             // check plugin modules versions
         }).then((_plugin) => {
-            this._logger?.("debug", "Check modules", false, plugin.name);
+            this._logger?.("debug", "Check modules", false, pluginName);
             return this.checkModules(_plugin).then(() => {
                 return _plugin;
             });
@@ -490,25 +490,26 @@ class PluginsManager extends node_events_1.default {
     // uninstall a plugin, using "data" in arguments for "release" and "uninstall" plugin's methods
     uninstall(plugin, ...data) {
         let directory = "";
-        let key = -1;
         let pluginName = "";
         // check plugin
         return Promise.resolve().then(() => {
             return (0, checkOrchestrator_1.default)("uninstall/plugin", plugin).then(() => {
-                key = this.getPluginsNames().findIndex((name) => {
-                    return name === plugin.name;
-                });
-                return -1 < key ? Promise.resolve() : Promise.reject(new Error("Plugin \"" + plugin.name + "\" is not registered"));
+                pluginName = plugin.name;
+                if (!this.getPluginsNames().includes(pluginName)) {
+                    throw new Error("Plugin \"" + pluginName + "\" is not registered");
+                }
             });
             // check plugin directory
         }).then(() => {
             return (0, checkAbsoluteDirectory_1.default)("uninstall/directory", this.directory).then(() => {
-                pluginName = plugin.name;
                 directory = (0, node_path_1.join)(this.directory, pluginName);
                 return (0, checkAbsoluteDirectory_1.default)("uninstall/plugindirectory", directory);
             });
             // release plugin
         }).then(() => {
+            const key = this.getPluginsNames().findIndex((name) => {
+                return name === pluginName;
+            });
             return plugin.release(...data).then(() => {
                 return (0, rmdirp_1.default)((0, node_path_1.join)(this.externalResourcesDirectory, pluginName));
             }).then(() => {

package/package.json

@@ -1,7 +1,7 @@
 {
 
   "name": "node-pluginsmanager",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "description": "A plugins manager.",
 
   "type": "commonjs",
@@ -53,7 +53,7 @@
   },
   "devDependencies": {
     "@types/express": "5.0.6",
-    "@types/node": "26.0.1",
+    "@types/node": "26.1.0",
     "@types/semver": "7.7.1",
     "@types/socket.io": "3.0.2",
     "@types/ws": "8.18.1",
@@ -61,7 +61,7 @@
     "express": "5.2.1",
     "husky": "9.1.7",
     "mocha": "11.7.6",
-    "node-pluginsmanager-plugin": "7.4.0",
+    "node-pluginsmanager-plugin": "7.4.2",
     "nyc": "18.0.0",
     "proxyquire": "2.1.3",
     "rimraf": "6.1.3",

package/lib/cjs/utils/extractGithub.d.ts

@@ -1,7 +0,0 @@
-import type { Orchestrator } from "node-pluginsmanager-plugin";
-interface OrchestratorExtended extends Orchestrator {
-    "github"?: string;
-    "repository"?: string | Record<string, string>;
-}
-export default function extractGithub(plugin: OrchestratorExtended): string | null;
-export {};

package/lib/cjs/utils/extractGithub.js

@@ -1,20 +0,0 @@
-"use strict";
-// types & interfaces
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = extractGithub;
-// module
-function extractGithub(plugin) {
-    let github = null;
-    if ("object" === typeof plugin) {
-        if ("string" === typeof plugin.github) {
-            github = plugin.github;
-        }
-        else if ("string" === typeof plugin.repository) {
-            github = plugin.repository;
-        }
-        else if ("object" === typeof plugin.repository && "string" === typeof plugin.repository.url) {
-            github = plugin.repository.url;
-        }
-    }
-    return github ?? null;
-}