node-pluginsmanager-plugin 5.0.14 → 5.1.0

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

@@ -1,6 +1,6 @@
-import { OpenApiValidator } from "express-openapi-validate";
 import { iServerResponse } from "./Server";
 import DescriptorUser, { iDescriptorUserOptions } from "./DescriptorUser";
+import { OpenApiValidator } from "express-openapi-validate";
 export interface iUrlParameters {
     "path": {
         [key: string]: any;

package/lib/cjs/components/Mediator.js

@@ -3,14 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-// deps
-// externals
-const express_openapi_validate_1 = require("express-openapi-validate");
 const checkObject_1 = require("../checkers/TypeError/checkObject");
 const checkNonEmptyString_1 = require("../checkers/RangeError/checkNonEmptyString");
 const checkNonEmptyObject_1 = require("../checkers/RangeError/checkNonEmptyObject");
 const extractPathMethodByOperationId_1 = __importDefault(require("../utils/descriptor/extractPathMethodByOperationId"));
 const DescriptorUser_1 = __importDefault(require("./DescriptorUser"));
+// types & interfaces
+// externals
+const express_openapi_validate_1 = require("express-openapi-validate");
 // module
 class Mediator extends DescriptorUser_1.default {
     // constructor

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

@@ -34,7 +34,6 @@ export default class Orchestrator extends MediatorUser {
     scripts: object | null;
     version: string;
     constructor(options: iOrchestratorOptions);
-    checkDescriptor(): Promise<void>;
     checkConf(): Promise<void>;
     isEnable(): Promise<void>;
     checkFiles(): Promise<void>;

package/lib/cjs/components/Orchestrator.js

@@ -4,9 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 // deps
-// externals
+// natives
 const node_path_1 = require("node:path");
-const swagger_parser_1 = __importDefault(require("@apidevtools/swagger-parser"));
 // locals
 const checkObject_1 = require("../checkers/TypeError/checkObject");
 const MediatorUser_1 = __importDefault(require("./MediatorUser"));
@@ -46,13 +45,6 @@ class Orchestrator extends MediatorUser_1.default {
         this.version = "";
     }
     // public
-    checkDescriptor() {
-        return super.checkDescriptor().then(() => {
-            return swagger_parser_1.default.validate(this._descriptorFile);
-        }).then(() => {
-            return Promise.resolve();
-        });
-    }
     // checkers
     checkConf() {
         return Promise.resolve();
@@ -255,11 +247,17 @@ class Orchestrator extends MediatorUser_1.default {
             return this.isEnable();
         }).then(() => {
             return !this.enabled ? Promise.resolve() : Promise.resolve().then(() => {
-                // create Descriptor
-                return swagger_parser_1.default.bundle(this._descriptorFile).then((content) => {
-                    return Promise.resolve(content);
-                }).then((content) => {
-                    this._Descriptor = content;
+                const SwaggerParser = require("@apidevtools/swagger-parser");
+                // generate descriptor
+                return SwaggerParser.bundle(this._descriptorFile).then((bundledDescriptor) => {
+                    // force validate because of stupid malformatted references
+                    return SwaggerParser.validate(bundledDescriptor).then((validatedDescriptor) => {
+                        this._Descriptor = validatedDescriptor;
+                        if (!this._Descriptor.servers) {
+                            this._Descriptor.servers = [];
+                        }
+                    });
+                }).then(() => {
                     return this.checkDescriptor().catch((err) => {
                         this._Descriptor = null;
                         return Promise.reject(err);

package/lib/cjs/components/Server.js

@@ -85,6 +85,7 @@ class Server extends MediatorUser_1.default {
             return next();
         }
         this.checkDescriptor().then(() => {
+            var _a;
             // parse
             const { pathname, query } = (0, node_url_1.parse)(req.url, true);
             req.method = req.method ? req.method.toLowerCase() : "get";
@@ -121,29 +122,14 @@ class Server extends MediatorUser_1.default {
                     node_os_1.EOL + "content-length : " + req.headers["content-length"] : ""));
             // get descriptor
             if ("/" + this._Descriptor.info.title + "/api/descriptor" === req.pattern && "get" === req.method) {
-                return Promise.resolve().then(() => {
-                    // cannot extract only validate because of stupid malformatted references
-                    const SwaggerParser = require("@apidevtools/swagger-parser");
-                    return SwaggerParser.validate(this._Descriptor).then((api) => {
-                        // force compatibility
-                        return Promise.resolve(api);
-                    });
-                    // add current server
-                }).then((api) => {
-                    var _a;
-                    if (!api.servers) {
-                        api.servers = [];
-                    }
-                    const port = res.socket && res.socket.localPort ? res.socket.localPort : ((_a = res.socket) === null || _a === void 0 ? void 0 : _a.address()).port;
-                    api.servers.push({
-                        "url": req.validatedIp + ":" + port,
-                        "description": "Actual current server"
-                    });
-                    return Promise.resolve(api);
-                }).then((api) => {
-                    this._log("info", "<= [" + req.validatedIp + "] " + JSON.stringify(api));
-                    return (0, send_1.default)(req, res, serverCodes_1.default.OK, api, this._Descriptor.info.version, this._cors);
-                }).catch((err) => {
+                // add current server
+                const port = res.socket && res.socket.localPort ? res.socket.localPort : ((_a = res.socket) === null || _a === void 0 ? void 0 : _a.address()).port;
+                this._Descriptor.servers.push({
+                    "url": req.validatedIp + ":" + port,
+                    "description": "Actual current server"
+                });
+                this._log("info", "<= [" + req.validatedIp + "] " + JSON.stringify(this._Descriptor));
+                return (0, send_1.default)(req, res, serverCodes_1.default.OK, this._Descriptor, this._Descriptor.info.version, this._cors).catch((err) => {
                     this._log("error", err);
                     const result = {
                         "code": "INTERNAL_SERVER_ERROR",

package/package.json

@@ -1,7 +1,7 @@
 {
 
   "name": "node-pluginsmanager-plugin",
-  "version": "5.0.14",
+  "version": "5.1.0",
   "description": "An abstract parent plugin for node-pluginsmanager",
 
   "type": "commonjs",
@@ -19,11 +19,10 @@
 
   "scripts": {
 
-    "build": "npx tsc --project \"./tsconfig.json\"",
+    "build": "node ./removeOldBuild.js && npx tsc --project \"./tsconfig.json\"",
 
     "lint": "npx eslint ./test/**/*.js",
     "check-requires": "npx used-deps-analyzer \"./package.json\" \"./src\" --no-dev --overkill \"fs-extra\" \"node-promfs\"",
-    "check-requires-tests": "npx used-deps-analyzer \"./package.json\" \"./test\" --no-dev --overkill \"fs-extra\" \"node-promfs\"",
     "check-updates": "npx check-version-modules",
     "unit-tests": "npm run build && npx nyc --reporter=html --reporter=text mocha",
 
@@ -46,7 +45,7 @@
   },
   "devDependencies": {
     "@types/express": "4.17.17",
-    "@types/node": "20.5.0",
+    "@types/node": "20.5.4",
     "@types/socket.io": "3.0.2",
     "@types/uniqid": "5.3.2",
     "@types/ws": "8.5.5",