ismx-nexo-node-app 0.4.43 → 0.4.45

package/dist/js/business/BusinessProxy.js

@@ -40,15 +40,6 @@ class BusinessProxy {
     setModules(modules) {
         this.modules = modules;
     }
-    callFormal(tag, method, endpoint, request) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let response = yield this.call(tag, method, endpoint, request);
-            if ((response === null || response === void 0 ? void 0 : response.code) === "0")
-                return response.data;
-            else
-                throw response;
-        });
-    }
     call(tag, method, endpoint, request) {
         return __awaiter(this, void 0, void 0, function* () {
             let module = this.modules[tag];
@@ -62,7 +53,7 @@ class BusinessProxy {
                 headers.set(header, request.headers[header]);
             let response = null;
             try {
-                response = yield (0, node_fetch_1.default)(`${module.host}${endpoint}${this.map(request.query)}`, {
+                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,
@@ -71,14 +62,6 @@ class BusinessProxy {
             catch (error) {
                 throw new Error(`Module ${tag} is not responding`);
             }
-            if (response.ok) {
-                if (response.headers.get('Content-Type') === 'application/json')
-                    return yield response.json();
-                else
-                    return yield response.text();
-            }
-            else
-                throw yield response.json();
         });
     }
     map(query = {}) {

package/dist/js/repository/RepositoryRest.js

@@ -41,17 +41,15 @@ class RepositoryRest extends Repository_1.default {
             let call = fetch(this.baseUrl + endpoint + QueryUtils_1.default.map(request.query), Object.assign(Object.assign({}, request), { body: method !== "GET" ? JSON.stringify(request.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* () {
-                var _a, _b, _c, _d;
+                var _a, _b, _c, _d, _e;
                 let headers = {};
                 res.headers.forEach((value, key) => headers[key] = value);
-                let rawResponse = yield res.text();
-                (_b = (_a = this.options).onRawResponse) === null || _b === void 0 ? void 0 : _b.call(_a, request, rawResponse);
-                let response = {
-                    httpCode: res.status,
-                    content: JSON.parse(rawResponse, this.reviver),
-                    headers
-                };
-                (_d = (_c = this.options) === null || _c === void 0 ? void 0 : _c.onResponse) === null || _d === void 0 ? void 0 : _d.call(_c, request, response);
+                let content = yield res.text();
+                (_b = (_a = this.options).onRawResponse) === null || _b === void 0 ? void 0 : _b.call(_a, request, content);
+                if ((_c = headers['Content-Type']) === null || _c === void 0 ? void 0 : _c.startsWith('application/json'))
+                    content = JSON.parse(content, this.reviver);
+                let response = { httpCode: res.status, content: content, headers };
+                (_e = (_d = this.options) === null || _d === void 0 ? void 0 : _d.onResponse) === null || _e === void 0 ? void 0 : _e.call(_d, request, response);
                 return response;
             })).catch((error) => {
                 var _a, _b;

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

@@ -1,4 +1,5 @@
 import { HttpRequest } from "../api/Service";
+import fetch from 'node-fetch';
 export interface Module {
     id: string;
     tag: string;
@@ -9,7 +10,6 @@ export default class BusinessProxy {
     setModules(modules: {
         [key: string]: Module;
     }): void;
-    callFormal<Req, Res>(tag: string, method: string, endpoint: string, request: HttpRequest<Req>): Promise<Res | undefined>;
-    call<Req, Res>(tag: string, method: string, endpoint: string, request: HttpRequest<Req>): Promise<Res>;
+    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.43",
+  "version": "0.4.45",
   "description": "",
   "scripts": {
     "build": "rm -rf ./dist && npx tsc",

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

@@ -16,13 +16,7 @@ export default class BusinessProxy
         this.modules = modules
     }
 
-    async callFormal<Req, Res>(tag: string, method: string, endpoint: string, request: HttpRequest<Req>): Promise<Res | undefined> {
-        let response = await this.call<Req, Wrapper<Res>>(tag, method, endpoint, request);
-        if (response?.code === "0") return response.data;
-        else throw response;
-    }
-
-    async call<Req, Res>(tag: string, method: string, endpoint: string, request: HttpRequest<Req>): Promise<Res> {
+    async call<Req, Res>(tag: string, method: string, endpoint: string, request: HttpRequest<Req>): Promise<fetch.Response> {
         let module = this.modules[tag];
         if (!module) throw new Error(`Module ${tag} does not exist`);
 
@@ -35,18 +29,12 @@ export default class BusinessProxy
 
         let response = null;
         try {
-            response = await fetch(`${module.host}${endpoint}${this.map(request.query)}`, {
+            return await fetch(`${module.host}${endpoint}${this.map(request.query)}`, {
                 method: method,
                 body: method !== "GET" ? JSON.stringify(request.body) : undefined,
                 headers: headers,
             });
         } catch (error) { throw new Error(`Module ${tag} is not responding`); }
-
-        if (response.ok) {
-            if (response.headers.get('Content-Type') === 'application/json') return await response.json();
-            else return await response.text() as Res;
-        }
-        else throw await response.json();
     }
 
     private map(query: { [key:string]: string } = {}) {

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

@@ -56,15 +56,16 @@ export default class RepositoryRest<Body=any,Res=any> extends Repository
         // Añade información adicional a la respuesta y devuelve el resultado (o el error en su caso).
         return call.then(async (res: Response) => {
             let headers: any = {}; res.headers.forEach((value, key) => headers[key] = value);
-            let rawResponse = await res.text();
-            this.options.onRawResponse?.(request, rawResponse);
-            let response: HttpResponse<E> = {
-                httpCode: res.status,
-                content: JSON.parse(rawResponse, this.reviver) as E,
-                headers
-            };
+            let content: string | E = await res.text();
+            this.options.onRawResponse?.(request, content);
+
+            if (headers['Content-Type']?.startsWith('application/json'))
+                content = JSON.parse(content, this.reviver) as E;
+
+            let response: HttpResponse<E> = { httpCode: res.status, content: content as E, headers };
             this.options?.onResponse?.(request, response);
             return response;
+
         }).catch((error) => {
             this.options.onError?.(request, error);
             throw error;