node-pluginsmanager-plugin 5.0.8 → 5.0.11

package/lib/cjs/components/DescriptorUser.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import Events from "events";
+import { EventEmitter } from "events";
 import { OpenApiDocument } from "express-openapi-validate";
 export declare type tLogType = "data" | "debug" | "log" | "info" | "success" | "warning" | "error";
 export declare type tLogger = (type: tLogType, message: string | Error, bold?: boolean, pluginName?: string) => void;
@@ -8,7 +8,7 @@ export interface iDescriptorUserOptions {
     "descriptor"?: OpenApiDocument;
     "logger"?: tLogger;
 }
-export default class DescriptorUser extends Events {
+export default class DescriptorUser extends EventEmitter {
     initialized: boolean;
     protected _descriptorValidated: boolean;
     protected _externalRessourcesDirectory: string;

package/lib/cjs/components/DescriptorUser.js

@@ -1,11 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 //  deps
 // natives
-const events_1 = __importDefault(require("events"));
+const events_1 = require("events");
 // locals
 const checkObject_1 = require("../checkers/TypeError/checkObject");
 const checkNonEmptyObject_1 = require("../checkers/RangeError/checkNonEmptyObject");
@@ -16,7 +13,7 @@ const LOG_TYPES_ALLOWED = ["log", "info", "success", "warning", "error"];
 // module
 // Please note the fact that "_initWorkSpace" and "_releaseWorkSpace" method MUST be re-writted in Mediator class, and not in MediatorUser childs.
 // Please note the fact that "init" and "release" method MUST NOT be re-writted. Each child has is own init logic.
-class DescriptorUser extends events_1.default {
+class DescriptorUser extends events_1.EventEmitter {
     // constructor
     constructor(options) {
         super();

package/lib/cjs/components/Orchestrator.js

@@ -280,7 +280,16 @@ class Orchestrator extends MediatorUser_1.default {
                 // load
                 return new Promise((resolve, reject) => {
                     try {
-                        resolve(require(this._mediatorFile));
+                        const val = require(this._mediatorFile);
+                        if ("object" === typeof val && "function" === typeof val.default) {
+                            resolve(val.default);
+                        }
+                        else if ("function" === typeof val) {
+                            resolve(val);
+                        }
+                        else {
+                            reject(new Error("Mediator file loaded (\"" + this._mediatorFile + "\") does not contain a valid Mediator"));
+                        }
                     }
                     catch (e) {
                         reject(e);
@@ -306,7 +315,16 @@ class Orchestrator extends MediatorUser_1.default {
                 // load
                 return new Promise((resolve, reject) => {
                     try {
-                        resolve(require(this._serverFile));
+                        const val = require(this._serverFile);
+                        if ("object" === typeof val && "function" === typeof val.default) {
+                            resolve(val.default);
+                        }
+                        else if ("function" === typeof val) {
+                            resolve(val);
+                        }
+                        else {
+                            reject(new Error("Server file loaded (\"" + this._serverFile + "\") does not contain a valid Server"));
+                        }
                     }
                     catch (e) {
                         reject(e);

package/lib/cjs/utils/cleanSendedError.js

@@ -6,32 +6,10 @@ function cleanSendedError(data) {
         if (data instanceof Error) {
             return data.message;
         }
-        else if (data.message) {
-            return data.message instanceof Error ? data.message.message : data.message;
-        }
-        else if (data.error) { // 1 level recursive for "error" data (avoid too deep recursive analyse)
-            if (data.error instanceof Error) {
-                return data.error.message;
-            }
-            else if (data.error.message) {
-                return data.error.message instanceof Error ? data.error.message.message : data.error.message;
-            }
-            else {
-                return data.error;
-            }
-        }
-        else if (data.err) { // 1 level recursive for "err" data (avoid too deep recursive analyse)
-            if (data.err instanceof Error) {
-                return data.err.message;
-            }
-            else if (data.err.message) {
-                return data.err.message instanceof Error ? data.err.message.message : data.err.message;
-            }
-            else {
-                return data.err;
-            }
-        }
         else {
+            Object.keys(data).forEach((key) => {
+                data[key] = cleanSendedError(data[key]);
+            });
             return data;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-pluginsmanager-plugin",
-  "version": "5.0.8",
+  "version": "5.0.11",
   "description": "An abstract parent plugin for node-pluginsmanager",
 
   "type": "commonjs",
@@ -58,7 +58,7 @@
   },
   "devDependencies": {
     "@types/express": "4.17.13",
-    "@types/node": "18.0.3",
+    "@types/node": "18.0.6",
     "@types/socket.io": "3.0.2",
     "@types/uniqid": "5.3.2",
     "@types/ws": "8.5.3",
@@ -72,7 +72,7 @@
     "socket.io": "4.5.1",
     "socket.io-client": "4.5.1",
     "typescript": "4.7.4",
-    "ws": "8.8.0"
+    "ws": "8.8.1"
   },
   "homepage": "https://github.com/Psychopoulet/node-pluginsmanager-plugin#readme",
   "engines": {