node-pluginsmanager-plugin 5.0.10 → 5.0.12

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

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 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;
+export type tLogType = "data" | "debug" | "log" | "info" | "success" | "warning" | "error";
+export type tLogger = (type: tLogType, message: string | Error, bold?: boolean, pluginName?: string) => void;
 export interface iDescriptorUserOptions {
     "externalRessourcesDirectory": string;
     "descriptor"?: OpenApiDocument;

package/lib/cjs/components/Server.js

@@ -422,8 +422,9 @@ class Server extends MediatorUser_1.default {
         return this;
     }
     getClients() {
+        var _a, _b;
         switch (this._serverType()) {
-            case "WEBSOCKET":
+            case "WEBSOCKET": {
                 const result = [];
                 this._socketServer.clients.forEach((s) => {
                     if (!s.id) {
@@ -435,14 +436,26 @@ class Server extends MediatorUser_1.default {
                     };
                 });
                 return result;
+            }
             case "SOCKETIO": {
                 const result = [];
-                this._socketServer.sockets.sockets.forEach((s) => {
-                    result.push({
-                        "id": s.id,
-                        "status": s.connected ? "CONNECTED" : "DISCONNECTED"
+                if ("function" !== typeof ((_b = (_a = this._socketServer.sockets) === null || _a === void 0 ? void 0 : _a.sockets) === null || _b === void 0 ? void 0 : _b.has)) { // SocketIO V2
+                    for (const key in this._socketServer.sockets.sockets) {
+                        const s = this._socketServer.sockets.sockets[key];
+                        result.push({
+                            "id": s.id,
+                            "status": s.connected ? "CONNECTED" : "DISCONNECTED"
+                        });
+                    }
+                }
+                else {
+                    this._socketServer.sockets.sockets.forEach((s) => {
+                        result.push({
+                            "id": s.id,
+                            "status": s.connected ? "CONNECTED" : "DISCONNECTED"
+                        });
                     });
-                });
+                }
                 return result;
             }
             default:
@@ -467,6 +480,7 @@ class Server extends MediatorUser_1.default {
             return Promise.resolve(JSON.stringify(result));
             // log & send data
         }).then((result) => {
+            var _a, _b;
             switch (serverType) {
                 case "WEBSOCKET":
                     this._socketServer.clients.forEach((client) => {
@@ -482,8 +496,19 @@ class Server extends MediatorUser_1.default {
                     });
                     break;
                 case "SOCKETIO":
-                    if (this._socketServer.sockets.sockets.has(clientId)) {
-                        const socket = this._socketServer.sockets.sockets.get(clientId);
+                    {
+                        let socket = null;
+                        if ("function" !== typeof ((_b = (_a = this._socketServer.sockets) === null || _a === void 0 ? void 0 : _a.sockets) === null || _b === void 0 ? void 0 : _b.has)) { // SocketIO V2
+                            for (const key in this._socketServer.sockets.sockets) {
+                                if (key === clientId) {
+                                    socket = this._socketServer.sockets.sockets[key];
+                                    break;
+                                }
+                            }
+                        }
+                        else if (this._socketServer.sockets.sockets.has(clientId)) { // SocketIO V3&4
+                            socket = this._socketServer.sockets.sockets.get(clientId);
+                        }
                         if (socket && socket.connected) {
                             if (log) {
                                 this._log("info", "<= [PUSH|" + clientId + "] " + result);

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/lib/cjs/utils/descriptor/extractPathMethodByOperationId.d.ts

@@ -1,5 +1,5 @@
 import { OpenApiDocument } from "express-openapi-validate";
-export declare type tMethod = "get" | "put" | "post" | "delete" | "options" | "head" | "patch" | "trace";
+export type tMethod = "get" | "put" | "post" | "delete" | "options" | "head" | "patch" | "trace";
 export interface iPathMethod {
     "path": string;
     "method": tMethod;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-pluginsmanager-plugin",
-  "version": "5.0.10",
+  "version": "5.0.12",
   "description": "An abstract parent plugin for node-pluginsmanager",
 
   "type": "commonjs",
@@ -57,22 +57,22 @@
     "uniqid": "5.4.0"
   },
   "devDependencies": {
-    "@types/express": "4.17.13",
-    "@types/node": "18.0.4",
+    "@types/express": "4.17.17",
+    "@types/node": "18.14.0",
     "@types/socket.io": "3.0.2",
     "@types/uniqid": "5.3.2",
-    "@types/ws": "8.5.3",
+    "@types/ws": "8.5.4",
     "check-version-modules": "1.3.5",
     "coveralls": "3.1.1",
     "colors": "1.4.0",
-    "express": "4.18.1",
-    "husky": "8.0.1",
-    "mocha": "10.0.0",
+    "express": "4.18.2",
+    "husky": "8.0.3",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
-    "socket.io": "4.5.1",
-    "socket.io-client": "4.5.1",
-    "typescript": "4.7.4",
-    "ws": "8.8.0"
+    "socket.io": "4.6.1",
+    "socket.io-client": "4.6.1",
+    "typescript": "4.9.5",
+    "ws": "8.12.1"
   },
   "homepage": "https://github.com/Psychopoulet/node-pluginsmanager-plugin#readme",
   "engines": {