node-pluginsmanager-plugin 4.7.0 → 4.8.0

package/lib/components/DescriptorUser.js

@@ -156,6 +156,10 @@ module.exports = class DescriptorUser extends Events {
 
 							}
 
+							if (multiple) {
+								break;
+							}
+
 						}
 
 						return multiple ? Promise.reject(new Error(

package/lib/components/Orchestrator.js

@@ -581,18 +581,18 @@ module.exports = class Orchestrator extends MediatorUser {
 
 				return Promise.resolve().then(() => {
 
-					return this._Server ? this._Server.release(...data).then(() => {
+					return this._Mediator ? this._Mediator.release(...data).then(() => {
 
-						this._socketServer = null;
-						this._Server = null;
+						this._Mediator = null;
 
 					}) : Promise.resolve();
 
 				}).then(() => {
 
-					return this._Mediator ? this._Mediator.release(...data).then(() => {
+					return this._Server ? this._Server.release(...data).then(() => {
 
-						this._Mediator = null;
+						this._socketServer = null;
+						this._Server = null;
 
 					}) : Promise.resolve();
 

package/lib/components/Server.js

@@ -145,7 +145,7 @@ module.exports = class Server extends MediatorUser {
 				);
 
 				// get descriptor
-				if ("/" + this._Descriptor.info.title + "/descriptor" === req.pattern && "get" === req.method) {
+				if ("/" + this._Descriptor.info.title + "/api/descriptor" === req.pattern && "get" === req.method) {
 
 					return new Promise((resolve, reject) => {
 
@@ -157,6 +157,27 @@ module.exports = class Server extends MediatorUser {
 							return err ? reject(err) : resolve(api);
 						});
 
+					// add current server
+					}).then((api) => {
+
+						const protocol = res.socket && Boolean(res.socket.encrypted) ? "https" : "http";
+
+						let port = res.socket && res.socket.localPort ? res.socket.localPort : 0;
+						if (!port) {
+							port = "http" === protocol ? 80 : 443;
+						}
+
+						if (!api.servers) {
+							api.servers = [];
+						}
+
+						api.servers.push({
+							"url": protocol + "://" + req.validatedIp + ":" + port,
+							"description": "Actual current server"
+						});
+
+						return Promise.resolve(api);
+
 					}).then((api) => {
 
 						this._log("info", "<= [" + req.validatedIp + "] " + JSON.stringify(api));
@@ -179,7 +200,7 @@ module.exports = class Server extends MediatorUser {
 				}
 
 				// get plugin status
-				else if ("/" + this._Descriptor.info.title + "/status" === req.pattern && "get" === req.method) {
+				else if ("/" + this._Descriptor.info.title + "/api/status" === req.pattern && "get" === req.method) {
 
 					const initialized = this.initialized && this._Mediator.initialized;
 					const status = initialized ? "INITIALIZED" : "ENABLED";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-pluginsmanager-plugin",
-  "version": "4.7.0",
+  "version": "4.8.0",
   "description": "An abstract parent plugin for node-pluginsmanager",
   "main": "lib/main.js",
   "typings": "lib/index.d.ts",
@@ -35,25 +35,25 @@
     "url": "https://github.com/Psychopoulet/node-pluginsmanager-plugin/issues"
   },
   "dependencies": {
-    "@apidevtools/swagger-parser": "10.0.2",
+    "@apidevtools/swagger-parser": "10.0.3",
     "express-openapi-validate": "0.6.1"
   },
   "devDependencies": {
-    "@types/node": "16.4.3",
+    "@types/node": "17.0.23",
     "@types/socket.io": "3.0.2",
-    "@types/ws": "7.4.7",
-    "check-version-modules": "1.3.2",
+    "@types/ws": "8.5.3",
+    "check-version-modules": "1.3.5",
     "coveralls": "3.1.1",
     "colors": "1.4.0",
-    "eslint": "7.31.0",
-    "express": "4.17.1",
-    "husky": "7.0.1",
-    "mocha": "9.0.3",
+    "eslint": "8.12.0",
+    "express": "4.17.3",
+    "husky": "7.0.4",
+    "mocha": "9.2.2",
     "nyc": "15.1.0",
-    "socket.io": "4.1.3",
-    "socket.io-client": "4.1.3",
-    "typescript": "4.3.5",
-    "ws": "7.5.3"
+    "socket.io": "4.4.1",
+    "socket.io-client": "4.4.1",
+    "typescript": "4.6.3",
+    "ws": "8.5.0"
   },
   "homepage": "https://github.com/Psychopoulet/node-pluginsmanager-plugin#readme",
   "engines": {