@mondart/nestjs-common-module 2.6.0 → 2.6.6

package/dist/decorators/iam-context.decorator.js

@@ -9,18 +9,23 @@ exports.IamContext = (0, common_1.createParamDecorator)((data, ctx) => {
     return (0, exports.getIamContext)(request);
 });
 const getIamContext = (request) => {
-    const injectedPayload = request?.headers?.['injectedpayload'];
-    const ip = request?.headers['x-forwarded-for'] ||
+    const headers = typeof request?.headers === 'string'
+        ? JSON.parse(request?.headers)
+        : request?.headers;
+    const injectedPayload = headers?.['injectedpayload'];
+    const ip = headers?.['x-forwarded-for'] ||
+        headers?.['host'] ||
+        headers?.address ||
         request?.socket?.remoteAddress ||
         null;
-    const requestId = request?.headers['request-id'] ?? (0, crypto_1.randomUUID)();
-    const timestamp = new Date(request?.headers?.['timestamp']);
+    const requestId = headers?.['request-id'] ?? (0, crypto_1.randomUUID)();
+    const timestamp = new Date(headers?.['timestamp'] || headers?.['time'] || Date.now());
     let isAgent = false;
     let user;
     let agent;
     if (injectedPayload) {
         const data = JSON.parse(injectedPayload);
-        const token = request?.headers?.['authorization'];
+        const token = headers?.['authorization'];
         if (data) {
             if (!data?.is_agent && (data?.contact_id || data?.store_id)) {
                 user = {
@@ -40,7 +45,7 @@ const getIamContext = (request) => {
                 };
             }
         }
-        delete request?.headers?.['authorization'];
+        delete headers?.['authorization'];
     }
     return new iam_context_dto_1.IamContextDto({
         ip,

package/dist/filters/global-exception.filter.js

@@ -29,9 +29,18 @@ let GlobalExceptionFilter = class GlobalExceptionFilter {
             Sentry.captureException(exception, exception?.response);
         const context = host.switchToHttp();
         const type = host?.getType();
-        this.logger.error(`exceptionName: ${exception?.name}`, JSON.stringify(exception) ??
-            exception?.message ??
-            'Unknown exception occurred.');
+        const message = typeof exception?.message === 'string'
+            ? exception?.message !== ''
+                ? exception?.message
+                : 'Unknown exception occurred.'
+            : (typeof exception?.message === 'object' &&
+                Object.keys(exception?.message)?.length !== 0) ||
+                (Array.isArray(exception?.message) &&
+                    exception?.message?.length !== 0)
+                ? JSON.stringify(exception?.message)
+                : 'Unknown exception occurred.';
+        this.logger.error(`exceptionName: ${exception?.name} - ${message}`);
+        this.logger.debug(exception?.stack);
         if (type === 'rpc') {
             const exceptionsName = Object.values(exceptions).map((exception) => exception.name);
             if (exceptionsName.includes(exception.name)) {

package/dist/lib/captcha/captcha.guard.js

@@ -33,15 +33,18 @@ let CaptchaGuard = class CaptchaGuard {
         const captchaSettings = this.getCaptchaDetails(context);
         const request = context.switchToHttp().getRequest();
         const iamContext = (0, decorators_1.getIamContext)(request);
-        if (iamContext?.agentId || iamContext?.userId)
+        if (iamContext?.agentId || iamContext?.userId || !captchaSettings)
             return true;
         if (captchaSettings && captchaSettings.executeAfter) {
-            const ip = request.headers['x-forwarded-for'] || request.socket.remoteAddress;
+            const ip = iamContext?.ip || null;
             const result = await this.incExecutionTimes(ip, captchaSettings.executeAfter);
             if (result)
                 return true;
         }
-        const text = request.headers['captcha-token'];
+        const headers = typeof request?.headers === 'string'
+            ? JSON.parse(request?.headers)
+            : request?.headers;
+        const text = headers?.['captcha-token'];
         if (!text)
             throw new captcha_exception_1.InvalidCaptcha();
         await this.isCaptchaValid(text);

package/dist/lib/core-crud/controllers/core-crud.controller.js

@@ -11,39 +11,42 @@ class CoreCrudController {
         CoreCrudController.responseDto = responseDto;
     }
     async findAllWithPagination(query, paginateConfig, options, ...args) {
-        const response = await this.coreService.findAllWithPagination(query, paginateConfig, options);
+        const response = await this.coreService.findAllWithPagination(query, paginateConfig, options, ...args);
         if (!response)
             throw new common_1.NotFoundException(enums_1.SharedMessages.FETCH_FAILED);
         const serializedData = response.data.map((item) => new this.responseDto(item));
-        return new dto_1.SuccessResponse(serializedData, enums_1.SharedMessages.SUCCESSFUL, common_1.HttpStatus.OK, { ...response.meta, links: response.links });
+        return new dto_1.SuccessResponse(serializedData, enums_1.SharedMessages.SUCCESSFUL, common_1.HttpStatus.OK, {
+            ...response.meta,
+            links: response.links,
+        });
     }
     async findOneById(id, options, ...args) {
-        const response = await this.coreService.findOneById(id, options);
+        const response = await this.coreService.findOneById(id, options, ...args);
         if (!response)
             throw new common_1.NotFoundException(enums_1.SharedMessages.RESOURCE_NOT_FOUND);
         return new dto_1.SuccessResponse(new this.responseDto(response), enums_1.SharedMessages.SUCCESSFUL, common_1.HttpStatus.OK);
     }
     async create(createDto, options, ...args) {
-        const response = await this.coreService.create(createDto, options);
+        const response = await this.coreService.create(createDto, options, ...args);
         if (!response)
             throw new common_1.BadRequestException(enums_1.SharedMessages.CREATE_FAILED);
         return new dto_1.SuccessResponse(new this.responseDto(response), enums_1.SharedMessages.SUCCESSFUL, common_1.HttpStatus.CREATED);
     }
     async update({ id }, updateDto, options, ...args) {
-        const response = await this.coreService.update(id, updateDto, options);
+        const response = await this.coreService.update(id, updateDto, options, ...args);
         if (!response)
             throw new common_1.BadRequestException(enums_1.SharedMessages.UPDATE_FAILED);
         const foundItem = await this.coreService.findOneById(id, options);
         return new dto_1.SuccessResponse(new this.responseDto(foundItem), enums_1.SharedMessages.SUCCESSFUL, common_1.HttpStatus.OK);
     }
     async deleteById({ id }, options, ...args) {
-        const result = await this.coreService.deleteById(id, options);
+        const result = await this.coreService.deleteById(id, options, ...args);
         if (!result)
             throw new common_1.BadRequestException(enums_1.SharedMessages.DELETE_FAILED);
         return new dto_1.SuccessResponse(undefined, enums_1.SharedMessages.SUCCESSFUL, common_1.HttpStatus.OK);
     }
     async softDeleteById({ id }, options, ...args) {
-        const result = await this.coreService.softDeleteById(id, options);
+        const result = await this.coreService.softDeleteById(id, options, ...args);
         if (!result)
             throw new common_1.BadRequestException(enums_1.SharedMessages.DELETE_FAILED);
         return new dto_1.SuccessResponse(undefined, enums_1.SharedMessages.SUCCESSFUL, common_1.HttpStatus.OK);

package/dist/lib/core-crud/services/core-crud.service.d.ts

@@ -11,22 +11,22 @@ export declare abstract class CoreCrudService<T extends BaseModelEntity, CreateD
     protected readonly repository: Repository<T>;
     private readonly relationsPath;
     protected constructor(repository: Repository<T>);
-    create(createDto: CreateDto, options?: CoreBaseServiceOption): Promise<T>;
-    update(id: number, updateDto: Partial<UpdateDto> | DeepPartial<T> | QueryDeepPartialEntity<T>, options?: CoreUpdateServiceOption<T>): Promise<UpdateResult>;
-    updateMany(query: FindManyOptions<T>, updateDto: Partial<UpdateDto> | DeepPartial<T> | QueryDeepPartialEntity<T>, options?: CoreUpdateServiceOption<T>): Promise<void>;
-    upsert(upsertDto: QueryDeepPartialEntity<T>, upsertOptions: UpsertOptions<T>, options?: CoreBaseServiceOption): Promise<InsertResult>;
-    findAllWithPagination(query: PaginationQueryCustom, paginateConfig: PaginateConfig<T>, options?: CoreFindAllWithPaginationServiceOption<T>): Promise<Paginated<T>>;
-    findAll(query: FindManyOptions<T>, options?: CoreFindAllServiceOption): Promise<T[]>;
-    findOneById(id: number, options?: CoreFindOneByIdServiceOption<T>): Promise<T>;
-    findOne(query: FindManyOptions<T>, options?: CoreFindOneServiceOption): Promise<T>;
-    isExists(query: FindManyOptions<T>, options?: CoreBaseServiceOption): Promise<boolean>;
-    count(query: FindManyOptions<T>, options?: CoreBaseServiceOption): Promise<number>;
-    softDelete(query: FindOptionsWhere<T>, options?: CoreBaseServiceOption): Promise<UpdateResult>;
-    softDeleteById(id: string | string[] | number | number[], options?: CoreBaseServiceOption): Promise<UpdateResult>;
-    restore(query: FindOptionsWhere<T>, options?: CoreBaseServiceOption): Promise<UpdateResult>;
-    restoreById(id: string | string[] | number | number[], options?: CoreBaseServiceOption): Promise<UpdateResult>;
-    delete(query: FindOptionsWhere<T>, options?: CoreBaseServiceOption): Promise<DeleteResult>;
-    deleteById(id: string | string[] | number | number[], options?: CoreBaseServiceOption): Promise<DeleteResult>;
+    create(createDto: CreateDto, options?: CoreBaseServiceOption, ...args: any[]): Promise<T>;
+    update(id: number, updateDto: Partial<UpdateDto> | DeepPartial<T> | QueryDeepPartialEntity<T>, options?: CoreUpdateServiceOption<T>, ...args: any[]): Promise<UpdateResult>;
+    updateMany(query: FindManyOptions<T>, updateDto: Partial<UpdateDto> | DeepPartial<T> | QueryDeepPartialEntity<T>, options?: CoreUpdateServiceOption<T>, ...args: any[]): Promise<void>;
+    upsert(upsertDto: QueryDeepPartialEntity<T>, upsertOptions: UpsertOptions<T>, options?: CoreBaseServiceOption, ...args: any[]): Promise<InsertResult>;
+    findAllWithPagination(query: PaginationQueryCustom, paginateConfig: PaginateConfig<T>, options?: CoreFindAllWithPaginationServiceOption<T>, ...args: any[]): Promise<Paginated<T>>;
+    findAll(query: FindManyOptions<T>, options?: CoreFindAllServiceOption, ...args: any[]): Promise<T[]>;
+    findOneById(id: number, options?: CoreFindOneByIdServiceOption<T>, ...args: any[]): Promise<T>;
+    findOne(query: FindManyOptions<T>, options?: CoreFindOneServiceOption, ...args: any[]): Promise<T>;
+    isExists(query: FindManyOptions<T>, options?: CoreBaseServiceOption, ...args: any[]): Promise<boolean>;
+    count(query: FindManyOptions<T>, options?: CoreBaseServiceOption, ...args: any[]): Promise<number>;
+    softDelete(query: FindOptionsWhere<T>, options?: CoreBaseServiceOption, ...args: any[]): Promise<UpdateResult>;
+    softDeleteById(id: string | string[] | number | number[], options?: CoreBaseServiceOption, ...args: any[]): Promise<UpdateResult>;
+    restore(query: FindOptionsWhere<T>, options?: CoreBaseServiceOption, ...args: any[]): Promise<UpdateResult>;
+    restoreById(id: string | string[] | number | number[], options?: CoreBaseServiceOption, ...args: any[]): Promise<UpdateResult>;
+    delete(query: FindOptionsWhere<T>, options?: CoreBaseServiceOption, ...args: any[]): Promise<DeleteResult>;
+    deleteById(id: string | string[] | number | number[], options?: CoreBaseServiceOption, ...args: any[]): Promise<DeleteResult>;
     private relatedPropertyTransformer;
     private whereQueryTransformer;
     private isObject;

package/dist/lib/core-crud/services/core-crud.service.js

@@ -12,7 +12,7 @@ class CoreCrudService {
         const metadata = this.repository.metadata;
         this.relationsPath = metadata.relations.map((relation) => relation.propertyPath);
     }
-    async create(createDto, options) {
+    async create(createDto, options, ...args) {
         createDto = this.relatedPropertyTransformer(createDto);
         const entity = this.repository.create(createDto);
         if (options?.entityManager) {
@@ -22,7 +22,7 @@ class CoreCrudService {
             return await this.repository.save(entity);
         }
     }
-    async update(id, updateDto, options) {
+    async update(id, updateDto, options, ...args) {
         updateDto = this.relatedPropertyTransformer(updateDto);
         if (!options?.entityManager) {
             const selectFields = Object.keys(updateDto);
@@ -67,13 +67,13 @@ class CoreCrudService {
             };
         }
     }
-    async updateMany(query, updateDto, options) {
+    async updateMany(query, updateDto, options, ...args) {
         const foundEntities = await this.findAll(query, options);
         for await (const entity of foundEntities) {
             await this.update(entity.id, updateDto, options).catch((err) => console.log(err));
         }
     }
-    async upsert(upsertDto, upsertOptions, options) {
+    async upsert(upsertDto, upsertOptions, options, ...args) {
         try {
             upsertDto = this.relatedPropertyTransformer(upsertDto);
             let conflictPaths = [];
@@ -110,7 +110,7 @@ class CoreCrudService {
             throw new common_1.BadRequestException(helpers_1.MessageFormatter.replace(enums_1.SharedMessages.UPSERT_FAILED, error));
         }
     }
-    async findAllWithPagination(query, paginateConfig, options) {
+    async findAllWithPagination(query, paginateConfig, options, ...args) {
         return await (0, nestjs_paginate_1.paginate)(query, options?.selectQueryBuilder
             ? options.selectQueryBuilder
             : this.repository, {
@@ -122,7 +122,7 @@ class CoreCrudService {
                     : undefined,
         });
     }
-    async findAll(query, options) {
+    async findAll(query, options, ...args) {
         let result;
         query.where = this.whereQueryTransformer(query.where) ?? undefined;
         if (!options?.entityManager)
@@ -144,7 +144,7 @@ class CoreCrudService {
         }
         return result;
     }
-    async findOneById(id, options) {
+    async findOneById(id, options, ...args) {
         let result;
         if (options?.entityManager) {
             result = await options.entityManager.findOne(this.repository.target, {
@@ -175,7 +175,7 @@ class CoreCrudService {
         }
         return result;
     }
-    async findOne(query, options) {
+    async findOne(query, options, ...args) {
         let result;
         query.where = this.whereQueryTransformer(query.where) ?? undefined;
         if (options?.entityManager) {
@@ -199,7 +199,7 @@ class CoreCrudService {
         }
         return result;
     }
-    async isExists(query, options) {
+    async isExists(query, options, ...args) {
         let result;
         query.where = this.whereQueryTransformer(query.where) ?? undefined;
         if (options?.entityManager) {
@@ -210,7 +210,7 @@ class CoreCrudService {
         }
         return result;
     }
-    async count(query, options) {
+    async count(query, options, ...args) {
         let result;
         query.where = this.whereQueryTransformer(query.where) ?? undefined;
         if (options?.entityManager) {
@@ -221,7 +221,7 @@ class CoreCrudService {
         }
         return result;
     }
-    async softDelete(query, options) {
+    async softDelete(query, options, ...args) {
         const formatedQuery = this.whereQueryTransformer(query) ?? undefined;
         if (options?.entityManager) {
             return await options?.entityManager.softDelete(this.repository.target, formatedQuery);
@@ -230,7 +230,7 @@ class CoreCrudService {
             return await this.repository.softDelete(formatedQuery);
         }
     }
-    async softDeleteById(id, options) {
+    async softDeleteById(id, options, ...args) {
         if (options?.entityManager) {
             return await options?.entityManager.softDelete(this.repository.target, id);
         }
@@ -238,7 +238,7 @@ class CoreCrudService {
             return await this.repository.softDelete(id);
         }
     }
-    async restore(query, options) {
+    async restore(query, options, ...args) {
         const formatedQuery = this.whereQueryTransformer(query) ?? undefined;
         if (options?.entityManager) {
             return await options?.entityManager.restore(this.repository.target, formatedQuery);
@@ -247,7 +247,7 @@ class CoreCrudService {
             return await this.repository.restore(formatedQuery);
         }
     }
-    async restoreById(id, options) {
+    async restoreById(id, options, ...args) {
         if (options?.entityManager) {
             return await options?.entityManager.restore(this.repository.target, id);
         }
@@ -255,7 +255,7 @@ class CoreCrudService {
             return await this.repository.restore(id);
         }
     }
-    async delete(query, options) {
+    async delete(query, options, ...args) {
         const formatedQuery = this.whereQueryTransformer(query) ?? undefined;
         if (options?.entityManager) {
             return await options?.entityManager.delete(this.repository.target, formatedQuery);
@@ -264,7 +264,7 @@ class CoreCrudService {
             return await this.repository.delete(formatedQuery);
         }
     }
-    async deleteById(id, options) {
+    async deleteById(id, options, ...args) {
         if (options?.entityManager) {
             return await options?.entityManager.delete(this.repository.target, id);
         }

package/dist/lib/saga/exceptions/saga-invocation.exception.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SagaInvocationException = void 0;
 class SagaInvocationException extends Error {
     constructor(originalError, step) {
-        super(originalError.message);
+        super(`${step}: ${originalError.message}`);
         this.originalError = originalError;
         this.step = step;
         Object.setPrototypeOf(this, SagaInvocationException.prototype);

package/dist/lib/saga/index.d.ts

@@ -4,3 +4,4 @@ export { SagaStatus } from './enums';
 export { SagaBuilder } from './services';
 export { SagaModule } from './saga.module';
 export { Saga } from './decorators';
+export { SagaStep } from './types';

package/dist/lib/saga/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Saga = exports.SagaModule = exports.SagaBuilder = exports.SagaStatus = exports.SagaInvocationException = exports.SagaCompensationException = void 0;
+exports.SagaStep = exports.Saga = exports.SagaModule = exports.SagaBuilder = exports.SagaStatus = exports.SagaInvocationException = exports.SagaCompensationException = void 0;
 var exceptions_1 = require("./exceptions");
 Object.defineProperty(exports, "SagaCompensationException", { enumerable: true, get: function () { return exceptions_1.SagaCompensationException; } });
 Object.defineProperty(exports, "SagaInvocationException", { enumerable: true, get: function () { return exceptions_1.SagaInvocationException; } });
@@ -12,3 +12,5 @@ var saga_module_1 = require("./saga.module");
 Object.defineProperty(exports, "SagaModule", { enumerable: true, get: function () { return saga_module_1.SagaModule; } });
 var decorators_1 = require("./decorators");
 Object.defineProperty(exports, "Saga", { enumerable: true, get: function () { return decorators_1.Saga; } });
+var types_1 = require("./types");
+Object.defineProperty(exports, "SagaStep", { enumerable: true, get: function () { return types_1.SagaStep; } });