ismx-nexo-node-app 0.4.46 → 0.4.48

package/dist/js/business/BusinessProxy.js

@@ -31,8 +31,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_fetch_1 = __importStar(require("node-fetch"));
+const QueryUtils_1 = __importDefault(require("../repository/utils/QueryUtils"));
 class BusinessProxy {
     constructor() {
         this.modules = {};
@@ -42,36 +46,29 @@ class BusinessProxy {
     }
     call(tag, method, endpoint, request) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
             let module = this.modules[tag];
             if (!module)
                 throw new Error(`Module ${tag} does not exist`);
-            let headers = new node_fetch_1.Headers();
+            // Completa la información de las cabeceras con cabeceras comunes por llamada a API.
+            let headers = new node_fetch_1.Headers(request.headers);
             headers.set('Content-Type', 'application/json');
             headers.set('Cache-Control', 'no-cache');
             headers.set('Pragma', 'no-cache');
-            for (let header in request.headers)
-                headers.set(header, request.headers[header]);
-            let response = null;
+            for (const header of Object.keys(headers))
+                headers.set(header, (_b = (_a = request.headers) === null || _a === void 0 ? void 0 : _a[header]) !== null && _b !== void 0 ? _b : "");
+            // Si el body especificado es un objeto, lo convierte a JSON.
+            let body = request.body;
+            if ((_c = headers.get('Content-Type')) === null || _c === void 0 ? void 0 : _c.startsWith('application/json'))
+                body = JSON.stringify(request.body);
+            // Realiza la llamada a la API con las cabeceras y la URL base de la llamada.
             try {
-                return yield (0, node_fetch_1.default)(`${module.host}${endpoint}${this.map(request.query)}`, {
-                    method: method,
-                    body: method !== "GET" ? JSON.stringify(request.body) : undefined,
-                    headers: headers,
-                });
+                return (0, node_fetch_1.default)(module.host + endpoint + QueryUtils_1.default.map(request.query), Object.assign(Object.assign({}, request), { method, body: method !== "GET" ? body : undefined, headers }));
             }
             catch (error) {
                 throw new Error(`Module ${tag} is not responding`);
             }
         });
     }
-    map(query = {}) {
-        let queryString = "?";
-        for (const param in query) {
-            if (query[param] === undefined)
-                continue;
-            queryString += `${param}=${query[param]}&`;
-        }
-        return queryString;
-    }
 }
 exports.default = BusinessProxy;

package/dist/js/business/BusinessServer.js

@@ -83,6 +83,7 @@ class BusinessServer extends Business_1.default {
                 case 'xml': return this.express.xml();
                 case 'stream': return this.express.raw({ type: 'application/octet-stream', limit: '10mb' });
                 case 'image': return this.express.raw({ type: 'image/*', limit: '10mb' });
+                case '*': return this.express.raw({ limit: '10mb' });
                 default: return this.express.json();
             }
         })();

package/dist/js/repository/RepositoryRest.js

@@ -37,10 +37,11 @@ class RepositoryRest extends Repository_1.default {
             headers.set('Pragma', 'no-cache');
             for (const header of Object.keys(headers))
                 headers.set(header, (_e = (_d = request.headers) === null || _d === void 0 ? void 0 : _d[header]) !== null && _e !== void 0 ? _e : "");
-            // Realiza la llamada a la API con las cabeceras y la URL base de la llamada.
+            // Si el body especificado es un objeto, lo convierte a JSON.
             let body = request.body;
             if ((_f = headers.get('Content-Type')) === null || _f === void 0 ? void 0 : _f.startsWith('application/json'))
                 body = JSON.stringify(request.body);
+            // Realiza la llamada a la API con las cabeceras y la URL base de la llamada.
             let call = fetch(this.baseUrl + endpoint + QueryUtils_1.default.map(request.query), Object.assign(Object.assign({}, request), { body: method !== "GET" ? body : undefined, headers }));
             // Añade información adicional a la respuesta y devuelve el resultado (o el error en su caso).
             return call.then((res) => __awaiter(this, void 0, void 0, function* () {

package/dist/types/api/Service.d.ts

@@ -24,7 +24,7 @@ export declare class HttpResponse<T = any> {
     static ok<T = any>(content: T): HttpResponse<any>;
     static ko<T = any>(httpCode: number, content: T): HttpResponse<any>;
 }
-export type ServiceType = "json" | "xml" | 'stream' | 'image';
+export type ServiceType = "json" | "xml" | 'stream' | 'image' | '*';
 export default abstract class Service<Req, Res> {
     static readonly services: Service<any, any>[];
     readonly method: string;

package/dist/types/business/BusinessProxy.d.ts

@@ -11,5 +11,4 @@ export default class BusinessProxy {
         [key: string]: Module;
     }): void;
     call<Req, Res>(tag: string, method: string, endpoint: string, request: HttpRequest<Req>): Promise<fetch.Response>;
-    private map;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ismx-nexo-node-app",
-  "version": "0.4.46",
+  "version": "0.4.48",
   "description": "",
   "scripts": {
     "build": "rm -rf ./dist && npx tsc",

package/src/main/node/api/Service.ts

@@ -29,7 +29,7 @@ export class HttpResponse<T = any> {
 	}
 }
 
-export type ServiceType = "json" | "xml" | 'stream' | 'image';
+export type ServiceType = "json" | "xml" | 'stream' | 'image' | '*';
 export default abstract class Service<Req, Res>
 {
 	public static readonly services: Service<any, any>[] = []

package/src/main/node/business/BusinessProxy.ts

@@ -1,6 +1,7 @@
 import { HttpResponse, HttpRequest } from "../api/Service"
 import fetch, {Body, Headers} from 'node-fetch';
 import {Wrapper} from "../api/ServiceRestFormal";
+import QueryUtils from "../repository/utils/QueryUtils";
 
 export interface Module {
     id: string;
@@ -20,29 +21,26 @@ export default class BusinessProxy
         let module = this.modules[tag];
         if (!module) throw new Error(`Module ${tag} does not exist`);
 
-        let headers = new Headers();
+
+        // Completa la información de las cabeceras con cabeceras comunes por llamada a API.
+        let headers = new Headers(request.headers);
         headers.set('Content-Type', 'application/json');
         headers.set('Cache-Control', 'no-cache');
         headers.set('Pragma', 'no-cache');
-        for (let header in request.headers)
-            headers.set(header, request.headers[header]);
+        for (const header of Object.keys(headers))
+            headers.set(header, request.headers?.[header] ?? "");
+
+        // Si el body especificado es un objeto, lo convierte a JSON.
+        let body: string = request.body as string;
+        if (headers.get('Content-Type')?.startsWith('application/json'))
+            body = JSON.stringify(request.body);
 
-        let response = null;
+        // Realiza la llamada a la API con las cabeceras y la URL base de la llamada.
         try {
-            return await fetch(`${module.host}${endpoint}${this.map(request.query)}`, {
-                method: method,
-                body: method !== "GET" ? JSON.stringify(request.body) : undefined,
-                headers: headers,
+            return fetch(module.host + endpoint + QueryUtils.map(request.query), {
+                ...request, method, body: method !== "GET" ? body : undefined, headers
             });
-        } catch (error) { throw new Error(`Module ${tag} is not responding`); }
-    }
 
-    private map(query: { [key:string]: string } = {}) {
-        let queryString = "?"
-        for (const param in query) {
-            if (query[param] === undefined) continue;
-            queryString += `${param}=${query[param]}&`
-        }
-        return queryString;
+        } catch (error) { throw new Error(`Module ${tag} is not responding`); }
     }
 }

package/src/main/node/business/BusinessServer.ts

@@ -65,6 +65,7 @@ export default class BusinessServer extends Business
             case 'xml': return this.express.xml();
             case 'stream': return this.express.raw({ type: 'application/octet-stream', limit: '10mb' });
             case 'image': return this.express.raw({ type: 'image/*', limit: '10mb' });
+            case '*': return this.express.raw({ limit: '10mb' });
             default: return this.express.json();
         }})();
 

package/src/main/node/repository/RepositoryRest.ts

@@ -46,11 +46,12 @@ export default class RepositoryRest<Body=any,Res=any> extends Repository
         for (const header of Object.keys(headers))
             headers.set(header, request.headers?.[header] ?? "");
 
-        // Realiza la llamada a la API con las cabeceras y la URL base de la llamada.
+        // Si el body especificado es un objeto, lo convierte a JSON.
         let body: string = request.body as string;
         if (headers.get('Content-Type')?.startsWith('application/json'))
             body = JSON.stringify(request.body);
 
+        // Realiza la llamada a la API con las cabeceras y la URL base de la llamada.
         let call = fetch(this.baseUrl + endpoint + QueryUtils.map(request.query), {
             ...request, body: method !== "GET" ? body : undefined, headers
         });