npm - @servicelabsco/nestjs-utility-services - Versions diffs - 2.0.15 → 3.0.2 - Mend

@servicelabsco/nestjs-utility-services 2.0.15 → 3.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1293) hide show

package/dist/common/libraries/common.job.d.ts CHANGED Viewed

@@ -1,9 +1,8 @@
 import { Logger } from '@nestjs/common';
 import { Job } from 'bullmq';
 import 'dotenv/config';
-import { QueueOptionsDto } from '../../platformUtility/dtos/queue.options.dto';
-import { QueueService } from '../../platformUtility/services/queue.service';
-import { EventLogEntity } from '../../system/entities/event.log.entity';
+import type { QueueOptionsDto } from '../../platformUtility/dtos/queue.options.dto';
+import type { QueueService } from '../../platformUtility/services/queue.service';
 import { DatabaseEventDto } from '../dtos/database.event.dto';
 import { BaseJobInterface } from './base.job.interface';
 export declare class CommonJob implements BaseJobInterface {
@@ -15,14 +14,12 @@ export declare class CommonJob implements BaseJobInterface {
     protected eventId: number;
     protected mode: string;
     protected queueService: QueueService;
+    private static parseBullLimit;
     protected job: Job;
     protected disableDraining: boolean;
-    protected logIdentifier: string;
     protected hashIdentifier: string;
-    protected logJobActivity: boolean;
     protected completeLimit: number;
     protected failureLimit: number;
-    protected disableLogging: boolean;
     constructor(hash: string);
     dispatch(data?: any, options?: QueueOptionsDto, eventId?: number): Promise<any>;
     delayedDispatch(data: any, options?: QueueOptionsDto, eventId?: number): Promise<any>;
@@ -31,9 +28,4 @@ export declare class CommonJob implements BaseJobInterface {
     protected isColumnUpdated(event: DatabaseEventDto<any>, column: string | string[]): boolean;
     protected isNewRecord(event: DatabaseEventDto<any>): boolean;
     protected isMongoEntity(event: DatabaseEventDto<any>): boolean;
-    protected log(message: any): void;
-    protected info(message: any): void;
-    protected warn(message: any): void;
-    protected error(message: any): void;
-    protected saveLogs(): Promise<void | EventLogEntity>;
 }

package/dist/common/libraries/common.job.js CHANGED Viewed

@@ -3,9 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommonJob = void 0;
 const common_1 = require("@nestjs/common");
 require("dotenv/config");
-const event_log_entity_1 = require("../../system/entities/event.log.entity");
 const operation_exception_1 = require("./../exceptions/operation.exception");
 class CommonJob {
+    static parseBullLimit(envValue, fallback) {
+        const parsed = parseInt(envValue ?? '', 10);
+        return Number.isFinite(parsed) ? parsed : fallback;
+    }
     constructor(hash) {
         this.noDuplicate = false;
         this.priority = 1;
@@ -14,11 +17,8 @@ class CommonJob {
         this.logger = new common_1.Logger('EventQueue');
         this.mode = 'redis';
         this.disableDraining = false;
-        this.logIdentifier = null;
-        this.logJobActivity = false;
-        this.completeLimit = parseInt(process.env.BULL_QUEUE_COMPLETE_LIMIT, 10);
-        this.failureLimit = parseInt(process.env.BULL_QUEUE_FAILURE_LIMIT, 10);
-        this.disableLogging = process.env.BULL_LOG_DISABLE === 'true';
+        this.completeLimit = CommonJob.parseBullLimit(process.env.BULL_QUEUE_COMPLETE_LIMIT, 1000);
+        this.failureLimit = CommonJob.parseBullLimit(process.env.BULL_QUEUE_FAILURE_LIMIT, 5000);
         this.hashIdentifier = hash;
     }
     async dispatch(data, options, eventId) {
@@ -85,38 +85,7 @@ class CommonJob {
         return true;
     }
     isMongoEntity(event) {
-        return event.driver === 'mongo';
-    }
-    log(message) {
-        this.queueService.loggerService.info(message);
-    }
-    info(message) {
-        this.queueService.loggerService.info(message);
-    }
-    warn(message) {
-        this.queueService.loggerService.warn(message);
-    }
-    error(message) {
-        this.queueService.loggerService.error(message);
-    }
-    async saveLogs() {
-        if (this.disableLogging)
-            return this.queueService.loggerService.flushSession();
-        const startTime = this.queueService.loggerService.startTime;
-        const url = await this.queueService.loggerService.getFileUrl();
-        if (!url && !this.logJobActivity)
-            return;
-        const duration = new Date().getTime() - startTime.getTime();
-        const jobId = this.job?.id;
-        const identifier = this.logIdentifier || jobId || this.constructor.name;
-        const log = event_log_entity_1.EventLogEntity.create({
-            job_hash: this.hashIdentifier,
-            identifier,
-            url,
-            duration,
-        });
-        log.data = { data: this.job?.data?.payload };
-        return log.save();
+        return event.driver === 'mongodb' || event.driver === 'mongo';
     }
 }
 exports.CommonJob = CommonJob;

package/dist/common/libraries/common.job.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"common.job.js","sourceRoot":"","sources":["../../../src/common/libraries/common.job.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AAExC,yBAAuB;~~AAIvB~~,~~6EAAwE;AAExE,~~6EAAyE;AAUzE,MAAa,SAAS;IA+~~FlB~~,YAAY,IAAY;~~QAzFd~~,gBAAW,GAAY,KAAK,CAAC;QAO7B,aAAQ,GAAG,CAAC,CAAC;QAOb,YAAO,GAAG,KAAK,CAAC;QAOnB,UAAK,GAAW,qBAAqB,CAAC;QAOnC,WAAM,GAAW,IAAI,eAAM,CAAC,YAAY,CAAC,CAAC;QAc1C,SAAI,GAAW,OAAO,CAAC;~~QAqBvB~~,oBAAe,GAAY,KAAK,CAAC;~~QAOjC~~,kBAAa,~~GAAW,IAAI,CAAC;QAS7B,mBAAc,~~GAAG,~~KAAK~~,CAAC~~;QAEvB~~,~~kBAAa~~,~~GAAG,QAAQ,~~CAAC,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,~~EAAE~~,CAAC,CAAC;~~QACpE~~,iBAAY,GAAG,~~QAAQ~~,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,~~EAAE~~,CAAC,CAAC;~~QAClE~~,~~mBAAc,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,KAAK,MAAM,CAAC;QAO/D,~~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~~QAChD~~,OAAO,KAAK,CAAC,MAAM,KAAK,OAAO,CAAC;IACpC,CAAC;IASS,GAAG,CAAC,OAAY;QACtB,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;IAQS,IAAI,CAAC,OAAY;QACvB,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;IAQS,IAAI,CAAC,OAAY;QACvB,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;IAQS,KAAK,CAAC,OAAY;QACxB,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;IASS,KAAK,CAAC,QAAQ;QACpB,IAAI,IAAI,CAAC,cAAc;YAAE,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC;QAE/E,MAAM,SAAS,~~GAAG,~~IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC;QAC5D,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;QAE/D,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc;YAAE,OAAO;QAEzC,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;QAE5D,MAAM,KAAK,~~GAAG,IAAI,~~CAAC,~~GAAG,EAAE,EAAE,CAAC;QAC3B,~~MAAM,~~UAAU,GAAG,IAAI,CAAC,aAAa,IAAI,~~KAAK,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;QAExE,MAAM,GAAG,GAAG,iCAAc,CAAC,MAAM,CAAC;YAC9B,QAAQ,EAAE,IAAI,CAAC,cAAc;YAC7B,UAAU;YACV,GAAG;YACH,QAAQ;SACX,CAAC,CAAC;QAEH,GAAG,CAAC,IAAI,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,~~EAAE,~~CAAC;~~QAE7C~~,~~OAAO,GAAG,~~CAAC~~,IAAI,EAAE,CAAC~~;~~IACtB,CAAC;~~CACJ;~~AAnTD~~,~~8BAmTC~~"}
1	+ {"version":3,"file":"common.job.js","sourceRoot":"","sources":["../../../src/common/libraries/common.job.ts"],"names":[],"mappings":"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"}

package/dist/common/libraries/common.subscriber.d.ts CHANGED Viewed

@@ -1,11 +1,18 @@
-import { EntitySubscriberInterface, InsertEvent, QueryRunner, RemoveEvent, UpdateEvent } from 'typeorm';
+import { EntitySubscriberInterface, InsertEvent, QueryRunner, RemoveEvent, TransactionCommitEvent, TransactionRollbackEvent, UpdateEvent } from 'typeorm';
 import { DatabaseEventDto } from '../dtos/database.event.dto';
+interface DispatchableJob {
+    delayedDispatch(data: any): Promise<any>;
+}
 export declare class CommonSubscriber<T> implements EntitySubscriberInterface<T> {
     protected entityJob: any;
     protected jobIdentifier: string;
+    private readonly pendingDispatches;
     afterInsert(evt: InsertEvent<T>): Promise<any>;
     afterUpdate(evt: UpdateEvent<T>): Promise<any>;
     private triggerJob;
+    protected enqueueDispatch(queryRunner: QueryRunner | undefined, job: DispatchableJob | undefined, data: any): Promise<any> | void;
+    afterTransactionCommit(event: TransactionCommitEvent): Promise<void>;
+    afterTransactionRollback(event: TransactionRollbackEvent): Promise<void>;
     private getJob;
     protected getEventData(event: any): DatabaseEventDto<T>;
     protected getUpdateEventData(event: any): DatabaseEventDto<T>;
@@ -23,3 +30,4 @@ export declare class CommonSubscriber<T> implements EntitySubscriberInterface<T>
     protected isSoftRemoved(event: any): boolean;
     protected commitTransaction(queryRunner: QueryRunner): Promise<void>;
 }
+export {};

package/dist/common/libraries/common.subscriber.js CHANGED Viewed

@@ -1,9 +1,47 @@
 "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 () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommonSubscriber = void 0;
+const Sentry = __importStar(require("@sentry/node"));
 const auth_1 = require("./auth");
 const platform_utility_1 = require("./platform.utility");
+const custom_logger_1 = require("./custom.logger");
 class CommonSubscriber {
+    constructor() {
+        this.pendingDispatches = new WeakMap();
+    }
     async afterInsert(evt) {
         return this.triggerJob(evt);
     }
@@ -15,7 +53,41 @@ class CommonSubscriber {
         if (!job)
             return;
         const evt = this.getEventData(event);
-        return job.delayedDispatch(evt);
+        return this.enqueueDispatch(event.queryRunner, job, evt);
+    }
+    enqueueDispatch(queryRunner, job, data) {
+        if (!job || typeof job.delayedDispatch !== 'function')
+            return;
+        if (!queryRunner?.isTransactionActive) {
+            return job.delayedDispatch(data);
+        }
+        const bucket = this.pendingDispatches.get(queryRunner) ?? [];
+        bucket.push({ job, data });
+        this.pendingDispatches.set(queryRunner, bucket);
+    }
+    async afterTransactionCommit(event) {
+        const bucket = this.pendingDispatches.get(event.queryRunner);
+        if (!bucket?.length)
+            return;
+        this.pendingDispatches.delete(event.queryRunner);
+        for (const { job, data } of bucket) {
+            try {
+                await job.delayedDispatch(data);
+            }
+            catch (err) {
+                const errName = err?.name ?? 'UnknownError';
+                const jobName = job?.constructor?.name ?? 'UnknownJob';
+                global.console.error(`post-commit-dispatch-failed (job=${jobName}, type=${errName})`);
+                Sentry.captureException(err, {
+                    level: 'error',
+                    tags: { component: 'CommonSubscriber', job: jobName, error_type: errName },
+                });
+                custom_logger_1.CustomLogger.error('CommonSubscriber: post-commit dispatch failed', err);
+            }
+        }
+    }
+    async afterTransactionRollback(event) {
+        this.pendingDispatches.delete(event.queryRunner);
     }
     getJob() {
         if (this.entityJob)
@@ -85,9 +157,10 @@ class CommonSubscriber {
     handleFloatColumn(event, column, scale) {
         const original = event.databaseEntity[column] || 0;
         const updated = event.entity[column] || 0;
-        if (original === Math.round(updated * Math.pow(10, scale)) / Math.pow(10, scale))
-            return false;
-        return true;
+        const factor = Math.pow(10, scale);
+        const originalRounded = Math.round(original * factor) / factor;
+        const updatedRounded = Math.round(updated * factor) / factor;
+        return originalRounded !== updatedRounded;
     }
     handleNumberColumn(event, column) {
         const original = event.databaseEntity[column] || 0;
@@ -117,9 +190,8 @@ class CommonSubscriber {
         return true;
     }
     isSoftRemoved(event) {
-        if (event.entity.deleted_at)
-            return true;
-        return false;
+        const deletedAt = event.entity.deleted_at;
+        return deletedAt !== null && deletedAt !== undefined;
     }
     async commitTransaction(queryRunner) {
         await queryRunner.commitTransaction();

package/dist/common/libraries/common.subscriber.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"common.subscriber.js","sourceRoot":"","sources":["../../../src/common/libraries/common.subscriber.ts"],"names":[],"mappings":"~~;;;AAEA~~,iCAA8B;AAC9B,yDAAqD;~~AAWrD~~,MAAa,gBAAgB;~~IAoBzB~~,KAAK,CAAC,WAAW,CAAC,GAAmB;QACjC,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAOD,KAAK,CAAC,WAAW,CAAC,GAAmB;QACjC,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;~~IASO~~,KAAK,CAAC,UAAU,CAAC,KAAU;QAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC1B,IAAI,CAAC,GAAG;YAAE,OAAO;QAEjB,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QACrC,OAAO,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;~~IACpC~~,CAAC;IAQO,MAAM;QACV,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC,SAAS,CAAC;QAC1C,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,OAAO,kCAAe,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACtD,CAAC;QAED,OAAO;IACX,CAAC;IASS,YAAY,CAAC,KAAK;QACxB,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;QAE5C,IAAI,KAAK,EAAE,cAAc,EAAE,CAAC,MAAM,CAAC;YAAE,OAAO,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAE3E,OAAO,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IAOS,kBAAkB,CAAC,KAAK;QAC9B,OAAO;YACH,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,cAAc,EAAE,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC;YAC7C,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;YACjC,cAAc,EAAE,KAAK,CAAC,cAAc;YACpC,IAAI,EAAE,WAAI,CAAC,IAAI,EAAE;YACjB,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI;SACxD,CAAC;IACN,CAAC;IAQS,kBAAkB,CAAC,KAAK;QAC9B,OAAO;YACH,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;YACjC,IAAI,EAAE,WAAI,CAAC,IAAI,EAAE;YACjB,cAAc,EAAE,EAAE;YAClB,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI;SACxD,CAAC;IACN,CAAC;IAQO,WAAW,CAAC,KAAU;QAC1B,OAAO;YACH,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,SAAS;YACnC,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI;SAC5B,CAAC;IACN,CAAC;IAQO,aAAa,CAAC,KAAK;QACvB,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;QAC3D,OAAO,IAAI,KAAK,SAAS,CAAC;IAC9B,CAAC;IAQO,iBAAiB,CAAC,KAAK;QAC3B,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,cAAc,CAAC;YAAE,OAAO,OAAO,CAAC;QAE1D,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACpC,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,uBAAuB,CAAC,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC;gBACvG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;IACpD,CAAC;IAUO,uBAAuB,CAAC,KAAU,EAAE,MAAc;QACtD,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;QACnE,MAAM,IAAI,GAAG,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;QAExC,IAAI,IAAI,KAAK,OAAO;YAAE,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;QACnF,IAAI,IAAI,KAAK,qCAAqC;YAAE,OAAO,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAClG,IAAI,IAAI,KAAK,sCAAsC;YAAE,OAAO,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAEpG,OAAO,IAAI,CAAC;IAChB,CAAC;IAUO,iBAAiB,CAAC,KAAU,EAAE,MAAc,EAAE,KAAa;QAC/D,MAAM,QAAQ,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACnD,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;~~QAE1C~~,~~IAAI~~,~~QAAQ~~,~~KAAK~~,IAAI,CAAC,KAAK,CAAC,~~OAAO~~,GAAG,IAAI,CAAC,~~GAAG~~,CAAC,~~EAAE~~,~~EAAE~~,~~KAAK~~,CAAC,CAAC,GAAG,IAAI,CAAC,~~GAAG~~,CAAC,~~EAAE~~,~~EAAE~~,~~KAAK~~,CAAC~~;YAAE~~,~~OAAO~~,~~KAAK~~,CAAC;~~QAE/F~~,OAAO,~~IAAI~~,CAAC;~~IAChB~~,CAAC;IASO,kBAAkB,CAAC,KAAU,EAAE,MAAc;QACjD,MAAM,QAAQ,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACnD,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAE1C,OAAO,QAAQ,KAAK,OAAO,CAAC;IAChC,CAAC;IASO,mBAAmB,CAAC,KAAU,EAAE,MAAc;QAClD,MAAM,QAAQ,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC;QACvD,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC;QAE9C,OAAO,QAAQ,KAAK,OAAO,CAAC;IAChC,CAAC;IAQD,KAAK,CAAC,WAAW,CAAC,MAAsB;IAExC,CAAC;IASD,eAAe,CAAC,KAAU,EAAE,MAAc;QACtC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5C,IAAI,WAAW;YAAE,OAAO,IAAI,CAAC;QAE7B,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAC9C,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAEtE,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IACjE,CAAC;IAOD,WAAW,CAAC,KAAU;QAClB,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;QAE5C,IAAI,KAAK,EAAE,cAAc,EAAE,CAAC,MAAM,CAAC;YAAE,OAAO,KAAK,CAAC;QAElD,OAAO,IAAI,CAAC;IAChB,CAAC;IAQS,aAAa,CAAC,KAAK;~~QACzB~~,~~IAAI~~,KAAK,CAAC,MAAM,CAAC,UAAU;~~YAAE~~,OAAO,IAAI,~~CAAC;QAEzC~~,~~OAAO~~,KAAK,CAAC;~~IACjB~~,CAAC;IAQS,KAAK,CAAC,iBAAiB,CAAC,WAAwB;QACtD,MAAM,WAAW,CAAC,iBAAiB,EAAE,CAAC;QACtC,MAAM,WAAW,CAAC,gBAAgB,EAAE,CAAC;IACzC,CAAC;CACJ;~~AAxRD~~,~~4CAwRC~~"}
1	+ {"version":3,"file":"common.subscriber.js","sourceRoot":"","sources":["../../../src/common/libraries/common.subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAuC;AAWvC,iCAA8B;AAC9B,yDAAqD;AACrD,mDAA+C;AAoB/C,MAAa,gBAAgB;IAA7B;QAmBqB,sBAAiB,GAAG,IAAI,OAAO,EAAkC,CAAC;IA8UvF,CAAC;IAvUG,KAAK,CAAC,WAAW,CAAC,GAAmB;QACjC,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAOD,KAAK,CAAC,WAAW,CAAC,GAAmB;QACjC,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAUO,KAAK,CAAC,UAAU,CAAC,KAAU;QAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC1B,IAAI,CAAC,GAAG;YAAE,OAAO;QAEjB,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAC7D,CAAC;IAOS,eAAe,CAAC,WAAoC,EAAE,GAAgC,EAAE,IAAS;QACvG,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,CAAC,eAAe,KAAK,UAAU;YAAE,OAAO;QAE9D,IAAI,CAAC,WAAW,EAAE,mBAAmB,EAAE,CAAC;YACpC,OAAO,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACrC,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAC7D,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3B,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACpD,CAAC;IAOD,KAAK,CAAC,sBAAsB,CAAC,KAA6B;QACtD,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC7D,IAAI,CAAC,MAAM,EAAE,MAAM;YAAE,OAAO;QAC5B,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAEjD,KAAK,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,MAAM,EAAE,CAAC;YACjC,IAAI,CAAC;gBACD,MAAM,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YACpC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBASX,MAAM,OAAO,GAAI,GAAW,EAAE,IAAI,IAAI,cAAc,CAAC;gBACrD,MAAM,OAAO,GAAI,GAAW,EAAE,WAAW,EAAE,IAAI,IAAI,YAAY,CAAC;gBAChE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,oCAAoC,OAAO,UAAU,OAAO,GAAG,CAAC,CAAC;gBACtF,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE;oBACzB,KAAK,EAAE,OAAO;oBACd,IAAI,EAAE,EAAE,SAAS,EAAE,kBAAkB,EAAE,GAAG,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE;iBAC7E,CAAC,CAAC;gBACH,4BAAY,CAAC,KAAK,CAAC,+CAA+C,EAAE,GAAG,CAAC,CAAC;YAC7E,CAAC;QACL,CAAC;IACL,CAAC;IAMD,KAAK,CAAC,wBAAwB,CAAC,KAA+B;QAC1D,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IACrD,CAAC;IAQO,MAAM;QACV,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC,SAAS,CAAC;QAC1C,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,OAAO,kCAAe,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACtD,CAAC;QAED,OAAO;IACX,CAAC;IASS,YAAY,CAAC,KAAK;QACxB,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;QAE5C,IAAI,KAAK,EAAE,cAAc,EAAE,CAAC,MAAM,CAAC;YAAE,OAAO,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAE3E,OAAO,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IAOS,kBAAkB,CAAC,KAAK;QAC9B,OAAO;YACH,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,cAAc,EAAE,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC;YAC7C,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;YACjC,cAAc,EAAE,KAAK,CAAC,cAAc;YACpC,IAAI,EAAE,WAAI,CAAC,IAAI,EAAE;YACjB,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI;SACxD,CAAC;IACN,CAAC;IAQS,kBAAkB,CAAC,KAAK;QAC9B,OAAO;YACH,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;YACjC,IAAI,EAAE,WAAI,CAAC,IAAI,EAAE;YACjB,cAAc,EAAE,EAAE;YAClB,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI;SACxD,CAAC;IACN,CAAC;IAQO,WAAW,CAAC,KAAU;QAC1B,OAAO;YACH,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,SAAS;YACnC,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI;SAC5B,CAAC;IACN,CAAC;IAQO,aAAa,CAAC,KAAK;QACvB,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;QAC3D,OAAO,IAAI,KAAK,SAAS,CAAC;IAC9B,CAAC;IAQO,iBAAiB,CAAC,KAAK;QAC3B,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,cAAc,CAAC;YAAE,OAAO,OAAO,CAAC;QAE1D,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACpC,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,uBAAuB,CAAC,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC;gBACvG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;IACpD,CAAC;IAUO,uBAAuB,CAAC,KAAU,EAAE,MAAc;QACtD,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;QACnE,MAAM,IAAI,GAAG,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;QAExC,IAAI,IAAI,KAAK,OAAO;YAAE,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;QACnF,IAAI,IAAI,KAAK,qCAAqC;YAAE,OAAO,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAClG,IAAI,IAAI,KAAK,sCAAsC;YAAE,OAAO,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAEpG,OAAO,IAAI,CAAC;IAChB,CAAC;IAUO,iBAAiB,CAAC,KAAU,EAAE,MAAc,EAAE,KAAa;QAC/D,MAAM,QAAQ,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACnD,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAM1C,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QACnC,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC,GAAG,MAAM,CAAC;QAC/D,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,GAAG,MAAM,CAAC;QAE7D,OAAO,eAAe,KAAK,cAAc,CAAC;IAC9C,CAAC;IASO,kBAAkB,CAAC,KAAU,EAAE,MAAc;QACjD,MAAM,QAAQ,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACnD,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAE1C,OAAO,QAAQ,KAAK,OAAO,CAAC;IAChC,CAAC;IASO,mBAAmB,CAAC,KAAU,EAAE,MAAc;QAClD,MAAM,QAAQ,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC;QACvD,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC;QAE9C,OAAO,QAAQ,KAAK,OAAO,CAAC;IAChC,CAAC;IAQD,KAAK,CAAC,WAAW,CAAC,MAAsB;IAExC,CAAC;IASD,eAAe,CAAC,KAAU,EAAE,MAAc;QACtC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5C,IAAI,WAAW;YAAE,OAAO,IAAI,CAAC;QAE7B,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAC9C,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAEtE,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IACjE,CAAC;IAOD,WAAW,CAAC,KAAU;QAClB,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;QAE5C,IAAI,KAAK,EAAE,cAAc,EAAE,CAAC,MAAM,CAAC;YAAE,OAAO,KAAK,CAAC;QAElD,OAAO,IAAI,CAAC;IAChB,CAAC;IAQS,aAAa,CAAC,KAAK;QAGzB,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC;QAC1C,OAAO,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,SAAS,CAAC;IACzD,CAAC;IAQS,KAAK,CAAC,iBAAiB,CAAC,WAAwB;QACtD,MAAM,WAAW,CAAC,iBAAiB,EAAE,CAAC;QACtC,MAAM,WAAW,CAAC,gBAAgB,EAAE,CAAC;IACzC,CAAC;CACJ;AAjWD,4CAiWC"}

package/dist/common/libraries/custom.crypt.d.ts CHANGED Viewed

@@ -1,9 +1,22 @@
 export declare class CustomCrypt {
-    private static key;
-    private static readonly algorithm;
-    private static getKey;
+    private static legacyKey;
+    private static v2Key;
+    private static v2KeySaltSource;
+    private static deprecationWarned;
+    private static readonly LEGACY_ALGO;
+    private static readonly V2_ALGO;
+    private static readonly LEGACY_ITERATIONS;
+    private static readonly V2_ITERATIONS;
+    private static readonly LEGACY_SALT;
+    private static readonly V2_PREFIX;
+    private static readonly GCM_IV_LENGTH;
+    private static readonly GCM_TAG_LENGTH;
+    static resetKeyCache(): void;
+    private static getLegacyKey;
+    private static getV2Key;
     static encrypt(data: any): string;
     static decrypt(cipherText: string): any;
+    private static tryDecryptV2;
     private static tryDecrypt;
     private static tryDecryptSaltedFormat;
     private static evpBytesToKey;

package/dist/common/libraries/custom.crypt.js CHANGED Viewed

@@ -35,40 +35,111 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomCrypt = void 0;
 const crypto = __importStar(require("crypto"));
+const Sentry = __importStar(require("@sentry/node"));
 class CustomCrypt {
-    static getKey() {
-        if (!this.key) {
+    static resetKeyCache() {
+        this.legacyKey = null;
+        this.v2Key = null;
+        this.v2KeySaltSource = null;
+        this.deprecationWarned = false;
+    }
+    static getLegacyKey() {
+        if (!this.legacyKey) {
             const secretKey = process.env.APP_KEY || '';
             if (!secretKey) {
                 throw new Error('APP_KEY environment variable is required for encryption');
             }
-            this.key = crypto.pbkdf2Sync(secretKey, 'salt', 1000, 32, 'sha256');
+            this.legacyKey = crypto.pbkdf2Sync(secretKey, this.LEGACY_SALT, this.LEGACY_ITERATIONS, 32, 'sha256');
         }
-        return this.key;
+        return this.legacyKey;
+    }
+    static getV2Key() {
+        if (this.v2Key)
+            return this.v2Key;
+        const secretKey = process.env.APP_KEY || '';
+        if (!secretKey) {
+            throw new Error('APP_KEY environment variable is required for encryption');
+        }
+        const saltRaw = process.env.APP_CRYPT_SALT;
+        let salt;
+        if (typeof saltRaw === 'string' && saltRaw.length >= 16) {
+            salt = saltRaw;
+            this.v2KeySaltSource = 'env';
+        }
+        else {
+            salt = this.LEGACY_SALT;
+            this.v2KeySaltSource = 'legacy-default';
+            if (!this.deprecationWarned) {
+                global.console.warn('CustomCrypt: APP_CRYPT_SALT is not configured (or shorter than 16 chars). ' +
+                    'Falling back to the LEGACY literal salt for v2 key derivation. ' +
+                    'This is a migration aid — set APP_CRYPT_SALT to a random 32+ char string ' +
+                    'and restart to obtain per-installation key isolation. See FIN-108.');
+                this.deprecationWarned = true;
+            }
+        }
+        this.v2Key = crypto.pbkdf2Sync(secretKey, salt, this.V2_ITERATIONS, 32, 'sha256');
+        return this.v2Key;
     }
     static encrypt(data) {
         const originalText = JSON.stringify(data);
-        const key = this.getKey();
-        const iv = crypto.randomBytes(16);
-        const cipher = crypto.createCipheriv(this.algorithm, key, iv);
-        let encrypted = cipher.update(originalText, 'utf8', 'base64');
-        encrypted += cipher.final('base64');
-        return iv.toString('base64') + ':' + encrypted;
+        const key = this.getV2Key();
+        const iv = crypto.randomBytes(this.GCM_IV_LENGTH);
+        const cipher = crypto.createCipheriv(this.V2_ALGO, key, iv);
+        const enc1 = cipher.update(originalText, 'utf8');
+        const enc2 = cipher.final();
+        const ciphertext = Buffer.concat([enc1, enc2]);
+        const authTag = cipher.getAuthTag();
+        return `${this.V2_PREFIX}${iv.toString('base64')}:${authTag.toString('base64')}:${ciphertext.toString('base64')}`;
     }
     static decrypt(cipherText) {
-        if (cipherText == null || cipherText === '') {
+        if (cipherText == null || cipherText === '')
             return false;
+        if (typeof cipherText === 'string' && cipherText.startsWith(this.V2_PREFIX)) {
+            return this.tryDecryptV2(cipherText);
         }
-        const key = this.getKey();
-        const decrypted = this.tryDecrypt(cipherText, key);
-        if (decrypted !== false) {
+        const legacyKey = this.getLegacyKey();
+        const decrypted = this.tryDecrypt(cipherText, legacyKey);
+        if (decrypted !== false)
             return decrypted;
-        }
-        if (!this.looksLikeEncrypted(cipherText)) {
-            return this.tryPlaintextFallback(cipherText);
+        const allowPlaintext = process.env.CUSTOM_CRYPT_ALLOW_PLAINTEXT_FALLBACK === 'true';
+        if (allowPlaintext && !this.looksLikeEncrypted(cipherText)) {
+            const result = this.tryPlaintextFallback(cipherText);
+            if (result !== false) {
+                Sentry.captureMessage('CustomCrypt: plaintext fallback hit (CUSTOM_CRYPT_ALLOW_PLAINTEXT_FALLBACK=true)', {
+                    level: 'warning',
+                    tags: { service: 'CustomCrypt' },
+                    extra: { input_length: cipherText.length },
+                });
+            }
+            return result;
         }
         return false;
     }
+    static tryDecryptV2(cipherText) {
+        try {
+            const body = cipherText.slice(this.V2_PREFIX.length);
+            const parts = body.split(':');
+            if (parts.length !== 3)
+                return false;
+            const iv = Buffer.from(parts[0], 'base64');
+            const authTag = Buffer.from(parts[1], 'base64');
+            const ciphertext = Buffer.from(parts[2], 'base64');
+            if (iv.length !== this.GCM_IV_LENGTH)
+                return false;
+            if (authTag.length !== this.GCM_TAG_LENGTH)
+                return false;
+            const key = this.getV2Key();
+            const decipher = crypto.createDecipheriv(this.V2_ALGO, key, iv);
+            decipher.setAuthTag(authTag);
+            const dec1 = decipher.update(ciphertext);
+            const dec2 = decipher.final();
+            const plaintext = Buffer.concat([dec1, dec2]).toString('utf8');
+            return JSON.parse(plaintext);
+        }
+        catch {
+            return false;
+        }
+    }
     static tryDecrypt(cipherText, key) {
         const saltedResult = this.tryDecryptSaltedFormat(cipherText);
         if (saltedResult !== false)
@@ -98,7 +169,7 @@ class CustomCrypt {
                     encrypted = cipherText;
                 }
             }
-            const decipher = crypto.createDecipheriv(this.algorithm, key, iv);
+            const decipher = crypto.createDecipheriv(this.LEGACY_ALGO, key, iv);
             let decrypted = decipher.update(encrypted, 'base64', 'utf8');
             decrypted += decipher.final('utf8');
             return JSON.parse(decrypted);
@@ -121,7 +192,7 @@ class CustomCrypt {
             if (!secretKey)
                 return false;
             const { key, iv } = this.evpBytesToKey(secretKey, salt, 32, 16);
-            const decipher = crypto.createDecipheriv(this.algorithm, key, iv);
+            const decipher = crypto.createDecipheriv(this.LEGACY_ALGO, key, iv);
             let decrypted = decipher.update(ciphertext);
             decrypted = Buffer.concat([decrypted, decipher.final()]);
             return JSON.parse(decrypted.toString('utf8'));
@@ -149,6 +220,8 @@ class CustomCrypt {
         };
     }
     static looksLikeEncrypted(text) {
+        if (text.startsWith(this.V2_PREFIX))
+            return true;
         if (text.includes(':')) {
             const parts = text.split(':');
             const firstPart = parts[0];
@@ -178,6 +251,16 @@ class CustomCrypt {
     }
 }
 exports.CustomCrypt = CustomCrypt;
-CustomCrypt.key = null;
-CustomCrypt.algorithm = 'aes-256-cbc';
+CustomCrypt.legacyKey = null;
+CustomCrypt.v2Key = null;
+CustomCrypt.v2KeySaltSource = null;
+CustomCrypt.deprecationWarned = false;
+CustomCrypt.LEGACY_ALGO = 'aes-256-cbc';
+CustomCrypt.V2_ALGO = 'aes-256-gcm';
+CustomCrypt.LEGACY_ITERATIONS = 1000;
+CustomCrypt.V2_ITERATIONS = 600_000;
+CustomCrypt.LEGACY_SALT = 'salt';
+CustomCrypt.V2_PREFIX = 'v2:';
+CustomCrypt.GCM_IV_LENGTH = 12;
+CustomCrypt.GCM_TAG_LENGTH = 16;
 //# sourceMappingURL=custom.crypt.js.map

package/dist/common/libraries/custom.crypt.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"custom.crypt.js","sourceRoot":"","sources":["../../../src/common/libraries/custom.crypt.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAiC;~~AASjC~~,MAAa,WAAW;~~IAyBZ~~,MAAM,CAAC,~~MAAM~~;~~QACjB~~,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;~~YACZ~~,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;YAC5C,IAAI,CAAC,SAAS,EAAE,CAAC;gBACb,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;YAC/E,CAAC;~~YAKD~~,IAAI,CAAC,~~GAAG~~,GAAG,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,~~MAAM~~,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC;~~QACxE~~,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC;~~IACpB~~,CAAC;~~IAQD~~,MAAM,CAAC,OAAO,CAAC,IAAS;QACpB,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,GAAG,GAAG,IAAI,CAAC,~~MAAM~~,EAAE,CAAC;~~QAG1B~~,MAAM,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,~~EAAE~~,CAAC,CAAC;~~QAGlC~~,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,~~SAAS~~,EAAE,GAAG,EAAE,EAAE,~~CAAC~~,CAAC;~~QAG9D~~,IAAI,~~SAAS,~~GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,~~EAAE,QAAQ,~~CAAC,CAAC;~~QAC9D~~,~~SAAS~~,IAAI,MAAM,CAAC,KAAK,CAAC,~~QAAQ~~,CAAC,CAAC;~~QAKpC~~,OAAO,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,~~GAAG~~,~~GAAG~~,~~GAAG~~,~~SAAS~~,CAAC;~~IACnD~~,CAAC;~~IAQD~~,MAAM,CAAC,OAAO,CAAC,UAAkB;QAC7B,IAAI,UAAU,IAAI,IAAI,IAAI,UAAU,KAAK,EAAE,~~EAAE~~,CAAC;~~YAC1C~~,OAAO,KAAK,CAAC;~~QACjB~~,CAAC;QAED,MAAM,~~GAAG~~,GAAG,IAAI,CAAC,~~MAAM~~,EAAE,CAAC;~~QAG1B~~,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,~~GAAG~~,CAAC,CAAC;~~QACnD~~,IAAI,SAAS,KAAK,KAAK,~~EAAE~~,CAAC;~~YACtB~~,OAAO,~~SAAS~~,CAAC~~;QACrB~~,CAAC;~~QAGD~~,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;~~YACvC~~,~~OAAO~~,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;~~QACjD~~,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAMO,MAAM,CAAC,UAAU,CAAC,UAAkB,EAAE,GAAW;QAErD,MAAM,YAAY,GAAG,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;QAC7D,IAAI,YAAY,KAAK,KAAK;YAAE,OAAO,YAAY,CAAC;QAGhD,IAAI,CAAC;YACD,IAAI,EAAU,CAAC;YACf,IAAI,SAAiB,CAAC;YAEtB,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC3B,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACpC,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;gBACrC,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACzC,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC;oBACD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;oBAClD,IAAI,OAAO,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;wBACvB,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;wBAC1B,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;oBACrD,CAAC;yBAAM,CAAC;wBACJ,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;wBACzB,SAAS,GAAG,UAAU,CAAC;oBAC3B,CAAC;gBACL,CAAC;gBAAC,MAAM,CAAC;oBACL,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;oBACzB,SAAS,GAAG,UAAU,CAAC;gBAC3B,CAAC;YACL,CAAC;YAED,MAAM,QAAQ,GAAG,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,~~SAAS~~,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;~~YAClE~~,IAAI,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;YAC7D,SAAS,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAEpC,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACjC,CAAC;QAAC,MAAM,CAAC;YACL,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;~~IAOO~~,MAAM,CAAC,sBAAsB,CAAC,UAAkB;QACpD,IAAI,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YAClD,IAAI,OAAO,CAAC,MAAM,GAAG,EAAE;gBAAE,OAAO,KAAK,CAAC;YAEtC,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC1D,IAAI,YAAY,KAAK,UAAU;gBAAE,OAAO,KAAK,CAAC;YAE9C,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAClC,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAErC,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;YAC5C,IAAI,CAAC,SAAS;gBAAE,OAAO,KAAK,CAAC;YAE7B,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YAEhE,MAAM,QAAQ,GAAG,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,~~SAAS~~,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;~~YAClE~~,IAAI,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAC5C,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAEzD,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QAClD,CAAC;QAAC,MAAM,CAAC;YACL,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;~~IAMO~~,MAAM,CAAC,aAAa,CAAC,QAAgB,EAAE,IAAY,EAAE,MAAc,EAAE,KAAa;QACtF,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAClD,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,IAAI,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAE3B,OAAO,MAAM,CAAC,MAAM,GAAG,EAAE,GAAG,MAAM,GAAG,KAAK,EAAE,CAAC;YACzC,MAAM,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACf,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YACtB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACf,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;YAClB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACvC,OAAO;YACH,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC;YAC9B,EAAE,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;SAC7C,CAAC;IACN,CAAC;~~IAMO~~,MAAM,CAAC,kBAAkB,CAAC,IAAY;QAC1C,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC9B,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;~~YAE3B~~,IAAI,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;gBACjE,OAAO,IAAI,CAAC;YAChB,CAAC;QACL,CAAC;~~QAED~~,IAAI,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;YACvD,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;~~IAMO~~,MAAM,CAAC,oBAAoB,CAAC,UAAkB;QAClD,IAAI,CAAC;YACD,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;YAClC,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACnD,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAClC,CAAC;YACD,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACnD,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAClC,CAAC;~~YAED~~,OAAO,UAAU,CAAC;QACtB,CAAC;QAAC,MAAM,CAAC;YACL,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;;~~AAvOL~~,~~kCAwOC~~;~~AAjOkB~~,~~eAAG~~,GAAkB,IAAI,CAAC;~~AAOjB~~,~~qBAAS~~,GAAG,aAAa,CAAC"}
1	+ {"version":3,"file":"custom.crypt.js","sourceRoot":"","sources":["../../../src/common/libraries/custom.crypt.ts"],"names":[],"mappings":"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"}

package/dist/common/libraries/data.manager.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 import { CacheService } from '../../platformUtility/services/cache.service';
+import { SqlService } from '../../platformUtility/services/sql.service';
 import { ModelEntity } from '../../system/entities/model.entity';
 import { RelationshipEntity } from '../../system/entities/relationship.entity';
 import { BusinessRuleService } from '../../system/services/business.rule.service';
@@ -11,9 +12,10 @@ export declare class DataManager {
     protected readonly cacheService: CacheService;
     protected readonly preferenceService: PreferenceService;
     protected readonly businessRuleService: BusinessRuleService;
+    protected readonly sqlService: SqlService;
     protected params: GenericIndexParamDto;
     protected data: RecordDataManagerDto;
-    constructor(modelService: ModelService, cacheService: CacheService, preferenceService: PreferenceService, businessRuleService: BusinessRuleService);
+    constructor(modelService: ModelService, cacheService: CacheService, preferenceService: PreferenceService, businessRuleService: BusinessRuleService, sqlService: SqlService);
     handle(): Promise<void>;
     setBaseModelObjects(): Promise<void>;
     setBase(): void;

package/dist/common/libraries/data.manager.js CHANGED Viewed

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataManager = void 0;
+const crypto_1 = require("crypto");
 const auth_1 = require("./auth");
 const date_util_1 = require("./date.util");
-const hash_1 = require("./hash");
-const platform_utility_1 = require("./platform.utility");
 class DataManager {
-    constructor(modelService, cacheService, preferenceService, businessRuleService) {
+    constructor(modelService, cacheService, preferenceService, businessRuleService, sqlService) {
         this.modelService = modelService;
         this.cacheService = cacheService;
         this.preferenceService = preferenceService;
         this.businessRuleService = businessRuleService;
+        this.sqlService = sqlService;
         this.data = {};
         this.init();
     }
@@ -31,7 +31,7 @@ class DataManager {
         });
         await this.setQueryRestrictions(this.data.model, this.data.base);
         if (!this.params.trashed)
-            this.data.query_restrictions.push(`"${this.data.base}".deleted_at is null`);
+            this.data.query_restrictions.push(this.sqlService.softDeleteFilter(this.data.base));
     }
     setBase() {
         this.data.base = this.params.model.name.toLowerCase();
@@ -65,12 +65,9 @@ class DataManager {
         };
         let joinCondition = `"${source.base}".${source.column} = "${alias.base}".${alias.column}`;
         if (!this.params.trashed)
-            joinCondition += ` and "${alias.base}".deleted_at is null`;
+            joinCondition += ` and ${this.sqlService.softDeleteFilter(alias.base)}`;
         if (relationship.join_definition) {
-            const sourceRegex = /current/gi;
-            let join = relationship.join_definition.replace(sourceRegex, `"${source.base}"`);
-            const aliasRegex = /alias/gi;
-            join = join.replace(aliasRegex, `"${alias.base}"`);
+            const join = this.sqlService.substituteRelationshipTokens(relationship.join_definition, source.base, alias.base);
             joinCondition += ` and ${join}`;
         }
         const restrictions = await this.getQueryRestriction(relationship.reference_model, alias.base);
@@ -87,8 +84,7 @@ class DataManager {
         const queries = await this.businessRuleService.getQueryRestrictions(model.id);
         const data = [];
         queries.forEach((query) => {
-            const sourceRegex = /current/gi;
-            data.push(query.replace(sourceRegex, base));
+            data.push(this.sqlService.substituteSourceToken(query, base));
         });
         return data;
     }
@@ -165,8 +161,8 @@ class DataManager {
         this.setRequestCache();
     }
     async setRequestCache() {
-        this.data.request_identifier = hash_1.Hash.hashMD5(`${this.data.model.model_hash}-${Date.now()}-${platform_utility_1.PlatformUtility.generateRandomNumber(8)}`);
-        await this.cacheService.set(this.data.request_identifier, { user_id: auth_1.Auth.id, sql: this.data.sql }, date_util_1.DateUtil.getFutureDateTime(15));
+        this.data.request_identifier = (0, crypto_1.randomUUID)();
+        await this.cacheService.set(this.data.request_identifier, { user_id: auth_1.Auth.id(), sql: this.data.sql }, date_util_1.DateUtil.getFutureDateTime(15));
     }
     async loadFromCache() {
         const data = await this.cacheService.get(this.params.request_identifier);