node-pluginsmanager-plugin 6.0.2 → 6.0.4

package/lib/cjs/components/Mediator.js

@@ -8,7 +8,6 @@ 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 jsonParser_1 = __importDefault(require("../utils/jsonParser"));
 const DescriptorUser_1 = __importDefault(require("./DescriptorUser"));
 // types & interfaces
 // externals
@@ -108,9 +107,6 @@ class Mediator extends DescriptorUser_1.default {
                         if ("undefined" === typeof mutedRes.body || "" === mutedRes.body) {
                             mutedRes.body = {};
                         }
-                        else {
-                            mutedRes.body = (0, jsonParser_1.default)(mutedRes.body);
-                        }
                         const validateResponse = this._validator.validateResponse(foundPathMethod.method, foundPathMethod.path);
                         validateResponse(mutedRes);
                         return resolve();

package/lib/cjs/components/Server.js

@@ -319,7 +319,7 @@ class Server extends MediatorUser_1.default {
                             });
                         }
                         else {
-                            this._log("success", "<= [" + req.validatedIp + "] " + content);
+                            this._log("success", "<= [" + req.validatedIp + "] " + JSON.stringify(content));
                             return (0, send_1.default)(req, res, serverCodes_1.default.OK_PUT, content, {
                                 "apiVersion": apiVersion,
                                 "cors": this._cors,
@@ -337,7 +337,7 @@ class Server extends MediatorUser_1.default {
                         });
                     }
                     else {
-                        this._log("success", "<= [" + req.validatedIp + "] " + content);
+                        this._log("success", "<= [" + req.validatedIp + "] " + JSON.stringify(content));
                         return (0, send_1.default)(req, res, serverCodes_1.default.OK, content, {
                             "apiVersion": apiVersion,
                             "cors": this._cors,

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

@@ -1,5 +1,5 @@
 import { iIncomingMessage, iServerResponse } from "../components/Server";
-export default function send(req: iIncomingMessage, res: iServerResponse, code: number, content: string, options: {
+export default function send(req: iIncomingMessage, res: iServerResponse, code: number, content: any, options: {
     "apiVersion": string;
     "cors": boolean;
     "mime": string;

package/lib/cjs/utils/send.js

@@ -2,52 +2,82 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // module
 function send(req, res, code, content, options) {
-    return new Promise((resolve) => {
-        // force data for checking
-        res.statusCode = code;
-        res.headers = Object.assign({
-            "Content-Type": options.mime,
-            "Content-Length": content ? Buffer.byteLength(content) : 0,
-            "Status-Code-Url-Cat": "https://http.cat/" + code,
-            "API-Version": options.apiVersion
-        }, options.cors ? {
-            "Access-Control-Allow-Origin": "*",
-            "Access-Control-Allow-Credentials": true,
-            "Access-Control-Allow-Methods": req.headers["access-control-request-method"] ? req.headers["access-control-request-method"] : [
-                "GET",
-                "POST",
-                "PUT",
-                "DELETE",
-                "PATCH",
-                "OPTIONS"
-            ].join(", "),
-            "Access-Control-Allow-Headers": req.headers["access-control-request-headers"] ? req.headers["access-control-request-headers"] : [
-                "Origin",
-                "Accept",
-                "Accept-Version",
-                "Content-Length",
-                "Content-MD5",
-                "Content-Type",
-                "Date",
-                "X-Api-Version",
-                "X-File-Name",
-                "X-CSRF-Token",
-                "X-Requested-With"
-            ].join(", ")
-        } : {});
-        // send data
-        res.writeHead(res.statusCode, res.headers);
-        if (content) {
-            res.body = content; // for Mediator response validator
-            res.end(content, "utf-8", () => {
-                resolve();
-            });
+    return Promise.resolve().then(() => {
+        if (!content) {
+            return "";
         }
         else {
-            res.end(() => {
-                resolve();
-            });
+            let result = "";
+            if (options.mime.includes("application/json")) {
+                if ("string" === typeof content) {
+                    try {
+                        JSON.parse(content); // is content json & parseable ?
+                        result = content; // yes => valid JSON string, send it as it is
+                    }
+                    catch (e) {
+                        result = JSON.stringify(content); // no => not JSON string, send formatted one
+                    }
+                }
+                else {
+                    const stringified = JSON.stringify(content);
+                    if (stringified !== content) {
+                        result = stringified;
+                    }
+                }
+            }
+            else {
+                result = content;
+            }
+            return result;
         }
+    }).then((stringifiedContent) => {
+        return new Promise((resolve) => {
+            // force data for checking
+            res.statusCode = code;
+            res.headers = Object.assign({
+                "Content-Type": options.mime,
+                "Content-Length": stringifiedContent ? Buffer.byteLength(stringifiedContent) : 0,
+                "Status-Code-Url-Cat": "https://http.cat/" + code,
+                "API-Version": options.apiVersion
+            }, options.cors ? {
+                "Access-Control-Allow-Origin": "*",
+                "Access-Control-Allow-Credentials": true,
+                "Access-Control-Allow-Methods": req.headers["access-control-request-method"] ? req.headers["access-control-request-method"] : [
+                    "GET",
+                    "POST",
+                    "PUT",
+                    "DELETE",
+                    "PATCH",
+                    "OPTIONS"
+                ].join(", "),
+                "Access-Control-Allow-Headers": req.headers["access-control-request-headers"] ? req.headers["access-control-request-headers"] : [
+                    "Origin",
+                    "Accept",
+                    "Accept-Version",
+                    "Content-Length",
+                    "Content-MD5",
+                    "Content-Type",
+                    "Date",
+                    "X-Api-Version",
+                    "X-File-Name",
+                    "X-CSRF-Token",
+                    "X-Requested-With"
+                ].join(", ")
+            } : {});
+            // send data
+            res.writeHead(res.statusCode, res.headers);
+            if ("" !== stringifiedContent) {
+                res.body = content; // for Mediator response validator
+                res.end(stringifiedContent, "utf-8", () => {
+                    resolve();
+                });
+            }
+            else {
+                res.end(() => {
+                    resolve();
+                });
+            }
+        });
     });
 }
 exports.default = send;

package/package.json

@@ -1,7 +1,7 @@
 {
 
   "name": "node-pluginsmanager-plugin",
-  "version": "6.0.2",
+  "version": "6.0.4",
   "description": "An abstract parent plugin for node-pluginsmanager",
 
   "type": "commonjs",
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "@types/express": "4.17.21",
-    "@types/node": "20.10.2",
+    "@types/node": "20.10.3",
     "@types/socket.io": "3.0.2",
     "@types/uniqid": "5.3.4",
     "@types/ws": "8.5.10",