ismx-nexo-node-app 0.4.23 → 0.4.24

package/dist/js/api/Service.js

@@ -11,6 +11,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpResponse = void 0;
 class HttpResponse {
+    constructor() {
+        this.content = null;
+    }
     static ok(content) {
         let response = new HttpResponse();
         response.content = content;

package/dist/js/api/ServiceRest.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,11 +31,8 @@ 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 Service_1 = __importDefault(require("./Service"));
+const Service_1 = __importStar(require("./Service"));
 class ServiceRest extends Service_1.default {
     constructor(method, endpoint = "/") {
         super(method, endpoint);
@@ -26,7 +46,7 @@ class ServiceRest extends Service_1.default {
     }
     serveRest(request) {
         return __awaiter(this, void 0, void 0, function* () {
-            return {};
+            return Service_1.HttpResponse.ok(null);
         });
     }
 }

package/dist/js/repository/RepositoryRest.js

@@ -38,13 +38,17 @@ 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;
+                var _a, _b, _c, _d;
                 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, rawResponse);
                 let response = {
-                    httpCode: res.status, content: (yield res.json()), headers
+                    httpCode: res.status,
+                    content: JSON.stringify(rawResponse),
+                    headers
                 };
-                (_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.onResponse) === null || _b === void 0 ? void 0 : _b.call(_a, response);
+                (_d = (_c = this.options) === null || _c === void 0 ? void 0 : _c.onResponse) === null || _d === void 0 ? void 0 : _d.call(_c, response);
                 return response;
             })).catch((error) => {
                 var _a, _b;

package/dist/js/repository/RepositoryRestFormal.js

@@ -33,7 +33,7 @@ class RepositoryRestFormal extends RepositoryRest_1.default {
                         throw new BusinessErrors_1.FormalError({ code: content.code, description: content.description });
                 }
                 else
-                    throw new BusinessErrors_1.FormalError({ code: "-1", description: "Not formal response" });
+                    throw new BusinessErrors_1.FormalError({ code: "-1", description: "No formal response" });
             }))
                 .catch((error) => {
                 if (error instanceof BusinessErrors_1.FormalError)

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

@@ -16,13 +16,13 @@ export interface HttpRequest<T = any> {
     };
 }
 export declare class HttpResponse<T = any> {
-    content?: T;
+    content: T;
     httpCode?: number;
     headers?: {
         [key: string]: string;
     };
     static ok<T = any>(content: T): HttpResponse<any>;
-    static ko<T = any>(httpCode: number, content: T | undefined): HttpResponse<any>;
+    static ko<T = any>(httpCode: number, content: T): HttpResponse<any>;
 }
 export default abstract class Service<Req, Res> {
     static readonly services: Service<any, any>[];

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

@@ -3,7 +3,7 @@ import ServiceRest from "./ServiceRest";
 export interface Wrapper<T> {
     code: string;
     description: string;
-    data?: T;
+    data: T;
     debug?: string;
 }
 export default class ServiceRestFormal<Req = any, Res = any> extends ServiceRest<Req, Wrapper<Res>> {
@@ -14,10 +14,10 @@ export default class ServiceRestFormal<Req = any, Res = any> extends ServiceRest
     fullSelect<Req, Res>(request: HttpRequest<Req>, api: {
         select: ServiceRestFormal<Req, string[]>;
         full: ServiceRestFormal<Req, Res>;
-    }): Promise<(Awaited<Res> | undefined)[]>;
+    }): Promise<Awaited<Res>[]>;
     static unwrap<Res>(request: Promise<HttpResponse<Wrapper<Res>>>): Promise<Res | undefined>;
     static fullSelect<Req, Res>(request: HttpRequest<Req>, api: {
         select: ServiceRestFormal<Req, string[]>;
         full: ServiceRestFormal<Req, Res>;
-    }): Promise<(Awaited<Res> | undefined)[]>;
+    }): Promise<Awaited<Res>[]>;
 }

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

@@ -63,5 +63,5 @@ export default class ServiceRestFormalTemplate<Model = any> {
     protected fullSelect<Req, Res>(request: HttpRequest<Req>, api: {
         select: ServiceRestFormal<Req, string[]>;
         full: ServiceRestFormal<Req, Res>;
-    }): Promise<(Awaited<Res> | undefined)[]>;
+    }): Promise<Awaited<Res>[]>;
 }

package/dist/types/repository/RepositoryRest.d.ts

@@ -3,6 +3,7 @@ import { HttpRequest, HttpResponse } from "../api/Service";
 export interface RestOptions {
     interceptor?: (endpoint: string, request: HttpRequest) => HttpRequest | undefined;
     onResponse?: (response: HttpResponse) => void;
+    onRawResponse?: (response: string) => void;
     onError?: (error: Error) => void;
 }
 export default class RepositoryRest<Body = any, Res = any> extends Repository {

package/dist/types/repository/RepositoryRestFormal.d.ts

@@ -3,5 +3,5 @@ import { Wrapper } from "../api/ServiceRestFormal";
 import { HttpRequest } from "../api/Service";
 export default class RepositoryRestFormal<Body = any, S = any> extends RepositoryRest<Body, Wrapper<S>> {
     constructor(baseUrl: string, options?: RestOptions);
-    callFormal<B = Body, E = S>(method?: string, endpoint?: string, request?: HttpRequest<B>): Promise<E | undefined>;
+    callFormal<B = Body, E = S>(method?: string, endpoint?: string, request?: HttpRequest<B>): Promise<E>;
 }

package/dist/types/repository/RepositoryRestFormalTemplate.d.ts

@@ -20,5 +20,5 @@ export default class RepositoryRestFormalTemplate<Model> {
     map(request?: HttpRequest): Promise<{
         [key: string]: Model;
     }>;
-    call<E = {}, B = {}>(method: string, endpoint: string, request?: HttpRequest<B>): Promise<E | undefined>;
+    call<E = {}, B = {}>(method: string, endpoint: string, request?: HttpRequest<B>): Promise<E>;
 }

package/package.json

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

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

@@ -11,7 +11,7 @@ export interface HttpRequest<T = any> {
 }
 
 export class HttpResponse<T = any> {
-	content?: T;
+	content: T = null!;
 	httpCode?: number;
 	headers?: { [key: string]: string };
 
@@ -21,7 +21,7 @@ export class HttpResponse<T = any> {
 		response.httpCode = 200;
 		return response
 	}
-	static ko<T=any>(httpCode: number, content: T | undefined) {
+	static ko<T=any>(httpCode: number, content: T) {
 		let response = new HttpResponse();
 		response.content = content;
 		response.httpCode = httpCode;

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

@@ -14,6 +14,6 @@ export default class ServiceRest<Req, Res> extends Service<Req, Res>
 	}
 
 	async serveRest(request: HttpRequest<Req>): Promise<HttpResponse<Res>> {
-		return {};
+		return HttpResponse.ok(null);
 	}
 }

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

@@ -5,7 +5,7 @@ import {FormalError} from "../business/BusinessErrors";
 export interface Wrapper<T> {
 	code: string,
 	description: string,
-	data?: T
+	data: T
 	debug?: string
 }
 

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

@@ -3,64 +3,68 @@ import {HttpRequest, HttpResponse} from "../api/Service";
 import QueryUtils from "./utils/QueryUtils";
 
 export interface RestOptions {
-  interceptor?: (endpoint: string, request: HttpRequest) => HttpRequest | undefined
-  onResponse?: (response: HttpResponse) => void;
-  onError?: (error: Error) => void
+    interceptor?: (endpoint: string, request: HttpRequest) => HttpRequest | undefined
+    onResponse?: (response: HttpResponse) => void;
+    onRawResponse?: (response: string) => void;
+    onError?: (error: Error) => void
 }
 
 export default class RepositoryRest<Body=any,Res=any> extends Repository
 {
-  private readonly baseUrl: string;
+    private readonly baseUrl: string;
 
-  private readonly options: RestOptions
+    private readonly options: RestOptions
 
-  constructor(baseUrl: string, options: RestOptions={}) {
-    super();
-    this.baseUrl = baseUrl;
-    this.options = options;
-  }
+    constructor(baseUrl: string, options: RestOptions={}) {
+        super();
+        this.baseUrl = baseUrl;
+        this.options = options;
+    }
 
-  async call<B=Body, E = Res>(
-    method: string = 'GET',
-    endpoint: string = '/',
-    request: HttpRequest<B> = {},
-  ): Promise<HttpResponse<E>>
-  {
-    // Especifica el método de la llamada HTTP al recurso.
-    request.method = method;
+    async call<B=Body, E = Res>(
+        method: string = 'GET',
+        endpoint: string = '/',
+        request: HttpRequest<B> = {},
+    ): Promise<HttpResponse<E>>
+    {
+        // Especifica el método de la llamada HTTP al recurso.
+        request.method = method;
 
+        // Notifica que una petición REST va a ser realizada
+        request = this.options.interceptor?.(endpoint, request) ?? request
 
-    // Notifica que una petición REST va a ser realizada
-    request = this.options.interceptor?.(endpoint, request) ?? request
+        // 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 (const header of Object.keys(headers))
+            headers.set(header, request.headers?.[header] ?? "");
 
-    // 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 (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.
+        let call = fetch(this.baseUrl + endpoint + QueryUtils.map(request.query), {
+            ...request,
+            body: method !== "GET" ? JSON.stringify(request.body) : undefined,
+            headers
+        });
 
-    // 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" ? 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(async (res: Response) => {
-      let headers: any = {}; res.headers.forEach((value, key) => headers[key] = value);
-      let response: HttpResponse<E> = {
-        httpCode: res.status, content: (await res.json()) as E, headers
-      };
-      this.options?.onResponse?.(response);
-      return response;
-    }).catch((error) => {
-      this.options.onError?.(error);
-      throw error;
-    });
-  }
+        // 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?.(rawResponse);
+            let response: HttpResponse<E> = {
+                httpCode: res.status,
+                content: JSON.stringify(rawResponse) as E,
+                headers
+            };
+            this.options?.onResponse?.(response);
+            return response;
+        }).catch((error) => {
+            this.options.onError?.(error);
+            throw error;
+        });
+    }
 
 
 }

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

@@ -13,7 +13,7 @@ export default class RepositoryRestFormal<Body=any, S=any> extends RepositoryRes
 		method: string = 'GET',
 		endpoint: string = '/',
 		request: HttpRequest<B> = {},
-	): Promise<E | undefined> {
+	): Promise<E> {
 
 		return super.call<B, Wrapper<E>>(method, endpoint, request)
 			.then(async (response) => {
@@ -21,7 +21,7 @@ export default class RepositoryRestFormal<Body=any, S=any> extends RepositoryRes
 				if (content) {
 					if (content.code === "0") return content.data;
 					else throw new FormalError({ code: content.code, description: content.description });
-				} else throw new FormalError({ code: "-1", description: "Not formal response" });
+				} else throw new FormalError({ code: "-1", description: "No formal response" });
 			})
 			.catch((error) => {
 				if (error instanceof FormalError) throw error;

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

@@ -78,7 +78,7 @@ export default class RepositoryRestFormalTemplate<Model> {
 		return (await this.repository.callFormal("GET", "/map", request)) ?? {};
 	}
 
-	async call<E={}, B={}>(method: string, endpoint: string, request: HttpRequest<B>={}): Promise<E | undefined> {
+	async call<E={}, B={}>(method: string, endpoint: string, request: HttpRequest<B>={}): Promise<E> {
 		return this.repository.callFormal<B, E>(method, endpoint, request);
 	}
 }