ismx-nexo-node-app 0.3.64 → 0.3.66

package/dist/js/api/ServiceRestFormal.js

@@ -37,6 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const Service_1 = __importStar(require("./Service"));
 const ServiceRest_1 = __importDefault(require("./ServiceRest"));
+const BusinessErrors_1 = require("../business/BusinessErrors");
 class ServiceRestFormal extends ServiceRest_1.default {
     constructor(method, endpoint = "/") {
         super(method, endpoint);
@@ -49,8 +50,10 @@ class ServiceRestFormal extends ServiceRest_1.default {
                 return Object.assign({}, response, { content });
             }
             catch (error) {
-                let content = ({ code: "-1", description: "Internal server error", debug: error.message });
-                throw error;
+                if (error instanceof BusinessErrors_1.FormalError)
+                    throw error;
+                else
+                    throw new BusinessErrors_1.FormalError({ code: "-1", description: "Internal server error", debug: error.message });
             }
         });
     }

package/dist/js/business/BusinessErrors.js

@@ -9,6 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.FormalError = void 0;
+class FormalError extends Error {
+    constructor(type) {
+        super();
+        this.type = type;
+    }
+}
+exports.FormalError = FormalError;
 class BusinessErrors {
     constructor() {
         this.errors = {};
@@ -22,13 +30,12 @@ class BusinessErrors {
     get(code, ...params) {
         var _a, _b;
         let error = (_a = this.errors[code]) !== null && _a !== void 0 ? _a : this.getFallback();
-        let result = Object.assign({}, error);
         for (const p in params)
-            result.description = (_b = result.description) === null || _b === void 0 ? void 0 : _b.replace(`\${${p}}`, params[p]);
-        return result;
+            error.description = (_b = error.description) === null || _b === void 0 ? void 0 : _b.replace(`\${${p}}`, params[p]);
+        return error;
     }
     except(code, ...params) {
-        let error = this.get(code, ...params);
+        let error = new FormalError(this.get(code, ...params));
         //this.onExcept?.(error)
         throw error;
     }

package/dist/js/business/BusinessServer.js

@@ -37,6 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const Service_1 = require("../api/Service");
 const Business_1 = __importDefault(require("./Business"));
+const BusinessErrors_1 = require("../business/BusinessErrors");
 class BusinessServer extends Business_1.default {
     constructor() {
         super();
@@ -128,6 +129,8 @@ class BusinessServer extends Business_1.default {
                 catch (e) { }
                 if (error instanceof Service_1.HttpResponse)
                     response = error;
+                if (error instanceof BusinessErrors_1.FormalError)
+                    response = error.type;
                 else
                     response = Service_1.HttpResponse.ko((_g = error.httpCode) !== null && _g !== void 0 ? _g : 500, error.content);
             }

package/dist/js/repository/RepositoryRestFormal.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const RepositoryRest_1 = __importDefault(require("./RepositoryRest"));
+const BusinessErrors_1 = require("../business/BusinessErrors");
 class RepositoryRestFormal extends RepositoryRest_1.default {
     constructor(baseUrl, options) {
         super(baseUrl, options);
@@ -29,16 +30,16 @@ class RepositoryRestFormal extends RepositoryRest_1.default {
                     if (content.code === "0")
                         return content.data;
                     else
-                        throw { code: content.code, description: content.description };
+                        throw new BusinessErrors_1.FormalError({ code: content.code, description: content.description });
                 }
                 else
-                    throw { code: "-1", description: "Not formal response" };
+                    throw new BusinessErrors_1.FormalError({ code: "-1", description: "Not formal response" });
             }))
                 .catch((error) => {
-                console.log("esto es", JSON.stringify(error));
-                if (error.code !== undefined)
+                if (error instanceof BusinessErrors_1.FormalError)
                     throw error;
-                throw { code: "-1", description: "ConnectionError", error: error.message };
+                else
+                    throw new BusinessErrors_1.FormalError({ code: "-1", description: "ConnectionError", debug: error.message });
             });
         });
     }

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

@@ -4,7 +4,7 @@ export interface Wrapper<T> {
     code: string;
     description: string;
     data?: T;
-    debug?: Error;
+    degug?: string;
 }
 export default class ServiceRestFormal<Req = any, Res = any> extends ServiceRest<Req, Wrapper<Res>> {
     constructor(method: string, endpoint?: string);

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

@@ -1,18 +1,23 @@
-export interface FormalError {
-    id: string;
+export interface ErrorType {
+    id?: string;
     code: string;
     description: string;
     httpCode?: number;
     group?: string;
+    debug?: any;
+}
+export declare class FormalError extends Error {
+    type: ErrorType;
+    constructor(type: ErrorType);
 }
 export default class BusinessErrors {
     private errors;
     init(): Promise<void>;
     setErrors(errors: {
-        [key: string]: FormalError;
+        [key: string]: ErrorType;
     }): void;
-    get(code: string, ...params: string[]): FormalError;
-    except(code: string, ...params: string[]): void;
+    get(code: string, ...params: string[]): ErrorType;
+    except(code: string, ...params: string[]): never;
     notFound(endpoint: string): void;
     unauthorized(): void;
     getQuery(key: string, query: {
@@ -36,5 +41,5 @@ export default class BusinessErrors {
     exists<T>(type: string, key: string, value: string, object?: T): T;
     isRegex(key: string, value: string, regex: string): string;
     isDate(key: string, value: string, format: string): Date;
-    getFallback(): FormalError;
+    getFallback(): ErrorType;
 }

package/dist/types/index.d.ts

@@ -37,7 +37,7 @@ export declare class BusinessServer extends _BusinessServer {
 import BaseBusinessThread from "./business/BusinessThread";
 export declare abstract class BusinessThread extends BaseBusinessThread {
 }
-import BaseBusinessErrors, { FormalError as BaseFormalError } from "./business/BusinessErrors";
+import BaseBusinessErrors, { ErrorType as BaseFormalError } from "./business/BusinessErrors";
 export declare class BusinessErrors extends BaseBusinessErrors {
 }
 export interface FormalError extends BaseFormalError {

package/package.json

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

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

@@ -1,11 +1,12 @@
 import Service, {HttpRequest, HttpResponse} from "./Service";
 import ServiceRest from "./ServiceRest";
+import {FormalError} from "../business/BusinessErrors";
 
 export interface Wrapper<T> {
 	code: string,
 	description: string,
 	data?: T
-	debug?: Error
+	degug?: string
 }
 
 export default class ServiceRestFormal<Req=any, Res=any> extends ServiceRest<Req, Wrapper<Res>>
@@ -21,8 +22,8 @@ export default class ServiceRestFormal<Req=any, Res=any> extends ServiceRest<Req
 			let content: Wrapper<Res> = ({ code: "0", description: "Service execution OK",  data: response.content })
 			return Object.assign({} as HttpResponse<Wrapper<Res>>, response, {content});
 		} catch (error: any) {
-			let content: Wrapper<any> = ({ code: "-1", description: "Internal server error", debug: error.message })
-			throw error;
+			if (error instanceof FormalError) throw error;
+			else throw new FormalError({ code: "-1", description: "Internal server error", debug: error.message })
 		}
 	}
 

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

@@ -1,30 +1,37 @@
-export interface FormalError {
-    id: string;
+export interface ErrorType {
+    id?: string;
     code: string;
     description: string;
     httpCode?: number;
     group?: string;
+    debug?: any;
+}
+
+export class FormalError extends Error {
+    type: ErrorType;
+    constructor(type: ErrorType) {
+        super(); this.type = type;
+    }
 }
 
 export default class BusinessErrors {
 
-    private errors: { [key: string]: FormalError } = {};
+    private errors: { [key: string]: ErrorType } = {};
 
     async init() { }
 
-    setErrors(errors: { [key: string]: FormalError }) {
+    setErrors(errors: { [key: string]: ErrorType }) {
         this.errors = errors;
     }
 
     get(code: string, ...params: string[]) {
         let error = this.errors[code] ?? this.getFallback();
-        let result = Object.assign({} as FormalError, error);
-        for (const p in params) result.description = result.description?.replace(`\${${p}}`, params[p])
-        return result;
+        for (const p in params) error.description = error.description?.replace(`\${${p}}`, params[p])
+        return error;
     }
 
-    except(code: string, ...params: string[]) {
-        let error = this.get(code, ...params)
+    except(code: string, ...params: string[]): never {
+        let error = new FormalError(this.get(code, ...params))
         //this.onExcept?.(error)
         throw error;
     }
@@ -95,7 +102,7 @@ export default class BusinessErrors {
         return new Date(value);
     }
 
-    getFallback(): FormalError {
+    getFallback(): ErrorType {
         return { id: "-1", description: "Internal Server error", code: "-1", httpCode: 500 };
     }
 }

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

@@ -1,5 +1,6 @@
 import Service, {HttpRequest, HttpResponse} from "../api/Service";
 import Business from "./Business";
+import {FormalError} from "../business/BusinessErrors";
 
 export default class BusinessServer extends Business
 {
@@ -89,6 +90,7 @@ export default class BusinessServer extends Business
         } catch (error: any) {
             try { error = this.onError?.(request, error); } catch (e) { }
             if (error instanceof HttpResponse) response = error;
+            if (error instanceof FormalError) response = error.type;
             else response = HttpResponse.ko(error.httpCode ?? 500, error.content);
 
         } finally {

package/src/main/node/index.ts

@@ -34,7 +34,7 @@ export class BusinessServer extends _BusinessServer {}
 import BaseBusinessThread from "./business/BusinessThread";
 export abstract class BusinessThread extends BaseBusinessThread {}
 
-import BaseBusinessErrors, { FormalError as BaseFormalError } from "./business/BusinessErrors";
+import BaseBusinessErrors, { ErrorType as BaseFormalError } from "./business/BusinessErrors";
 export class BusinessErrors extends BaseBusinessErrors {}
 export interface FormalError extends BaseFormalError {}
 

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

@@ -1,7 +1,7 @@
 import RepositoryRest, {RestOptions} from "./RepositoryRest";
 import {Wrapper} from "../api/ServiceRestFormal";
 import {HttpRequest} from "../api/Service";
-import { FormalError} from "../business/BusinessErrors";
+import {FormalError} from "../business/BusinessErrors";
 
 export default class RepositoryRestFormal<Body=any, S=any> extends RepositoryRest<Body, Wrapper<S>> {
 
@@ -20,13 +20,12 @@ export default class RepositoryRestFormal<Body=any, S=any> extends RepositoryRes
 				let content = response.content;
 				if (content) {
 					if (content.code === "0") return content.data;
-					else throw { code: content.code, description: content.description };
-				} else throw { code: "-1", description: "Not formal response" };
+					else throw new FormalError({ code: content.code, description: content.description });
+				} else throw new FormalError({ code: "-1", description: "Not formal response" });
 			})
 			.catch((error) => {
-				console.log("esto es", JSON.stringify(error));
-				if (error.code !== undefined) throw error;
-				throw { code: "-1", description: "ConnectionError", error: error.message };
+				if (error instanceof FormalError) throw error;
+				else throw new FormalError({ code: "-1", description: "ConnectionError", debug: error.message });
 			});
 	}
 }