@solidxai/core 0.1.6-beta.9 → 0.1.7

package/dist/services/permission-metadata.service.js

@@ -11,49 +11,95 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
+var PermissionMetadataService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PermissionMetadataService = void 0;
 const common_1 = require("@nestjs/common");
+const cache_manager_1 = require("@nestjs/cache-manager");
 const core_1 = require("@nestjs/core");
 const typeorm_1 = require("@nestjs/typeorm");
 const crud_service_1 = require("./crud.service");
+const cache_helper_1 = require("../helpers/cache.helper");
 const typeorm_2 = require("typeorm");
 const permission_metadata_repository_1 = require("../repository/permission-metadata.repository");
-let PermissionMetadataService = class PermissionMetadataService extends crud_service_1.CRUDService {
-    constructor(entityManager, repo, moduleRef) {
+let PermissionMetadataService = PermissionMetadataService_1 = class PermissionMetadataService extends crud_service_1.CRUDService {
+    constructor(entityManager, repo, moduleRef, cacheManager) {
         super(entityManager, repo, 'permissionMetadata', 'solid-core', moduleRef);
         this.entityManager = entityManager;
         this.repo = repo;
         this.moduleRef = moduleRef;
+        this.cacheManager = cacheManager;
+        this.logger = new common_1.Logger(PermissionMetadataService_1.name);
     }
-    findAllUsingRoles(roles) {
-        return this.repo.find({
-            where: {
-                roles: {
-                    name: (0, typeorm_2.In)(roles)
+    buildPermissionsByRoleCacheKey(roleName) {
+        return `permissions:role:${roleName}`;
+    }
+    async findAllUsingRoles(roles) {
+        const useCache = (0, cache_helper_1.shouldUseCache)();
+        const cached = [];
+        const uncachedRoles = [];
+        if (useCache) {
+            for (const role of roles) {
+                const cacheKey = this.buildPermissionsByRoleCacheKey(role);
+                const hit = await this.cacheManager.get(cacheKey);
+                if (hit) {
+                    cached.push(...hit);
+                }
+                else {
+                    uncachedRoles.push(role);
                 }
-            },
-            relations: {}
+            }
+        }
+        else {
+            uncachedRoles.push(...roles);
+        }
+        if (uncachedRoles.length === 0) {
+            return cached;
+        }
+        const fromDb = await this.repo.find({
+            where: { roles: { name: (0, typeorm_2.In)(uncachedRoles) } },
+            relations: { roles: true },
+        });
+        if (useCache) {
+            for (const role of uncachedRoles) {
+                const permsForRole = fromDb.filter(p => p.roles?.some(r => r.name === role));
+                await this.cacheManager.set(this.buildPermissionsByRoleCacheKey(role), permsForRole);
+            }
+        }
+        const seen = new Set();
+        return [...cached, ...fromDb].filter(p => {
+            if (seen.has(p.id))
+                return false;
+            seen.add(p.id);
+            return true;
         });
     }
-    permissionExistsInRole(role, permission) {
-        return this.repo.find({
-            where: {
-                name: permission,
-                roles: {
-                    name: role
-                }
-            },
-            relations: {}
+    async permissionExistsInRole(role, permission) {
+        const useCache = (0, cache_helper_1.shouldUseCache)();
+        const cacheKey = this.buildPermissionsByRoleCacheKey(role);
+        if (useCache) {
+            const hit = await this.cacheManager.get(cacheKey);
+            if (hit) {
+                return hit.filter(p => p.name === permission);
+            }
+        }
+        const fromDb = await this.repo.find({
+            where: { roles: { name: role } },
+            relations: { roles: true },
         });
+        if (useCache) {
+            await this.cacheManager.set(cacheKey, fromDb);
+        }
+        return fromDb.filter(p => p.name === permission);
     }
 };
 exports.PermissionMetadataService = PermissionMetadataService;
-exports.PermissionMetadataService = PermissionMetadataService = __decorate([
+exports.PermissionMetadataService = PermissionMetadataService = PermissionMetadataService_1 = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, typeorm_1.InjectEntityManager)()),
+    __param(3, (0, common_1.Inject)(cache_manager_1.CACHE_MANAGER)),
     __metadata("design:paramtypes", [typeorm_2.EntityManager,
         permission_metadata_repository_1.PermissionMetadataRepository,
-        core_1.ModuleRef])
+        core_1.ModuleRef, Object])
 ], PermissionMetadataService);
 //# sourceMappingURL=permission-metadata.service.js.map

package/dist/services/permission-metadata.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"permission-metadata.service.js","sourceRoot":"","sources":["../../src/services/permission-metadata.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uCAAyC;AACzC,6CAAsD;AACtD,iDAAwD;AACxD,qCAA4C;AAG5C,iGAA6F;AAItF,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,0BAA+B;IAC5E,YAEW,aAA4B,EAG5B,IAAkC,EAClC,SAAoB;QAG7B,KAAK,CAAC,aAAa,EAAE,IAAI,EAAE,oBAAoB,EAAE,YAAY,EAAC,SAAS,CAAC,CAAC;QAPhE,kBAAa,GAAb,aAAa,CAAe;QAG5B,SAAI,GAAJ,IAAI,CAA8B;QAClC,cAAS,GAAT,SAAS,CAAW;IAI/B,CAAC;IAGD,iBAAiB,CAAC,KAAe;QAC/B,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YACpB,KAAK,EAAE;gBACL,KAAK,EAAE;oBACL,IAAI,EAAE,IAAA,YAAE,EAAC,KAAK,CAAC;iBAChB;aACF;YACD,SAAS,EAAE,EAAE;SACd,CAAC,CAAC;IACL,CAAC;IAED,sBAAsB,CAAC,IAAY,EAAE,UAAkB;QACrD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YACpB,KAAK,EAAE;gBACL,IAAI,EAAE,UAAU;gBAChB,KAAK,EAAE;oBACL,IAAI,EAAE,IAAI;iBACX;aACF;YACD,SAAS,EAAE,EAAE;SACd,CAAC,CAAC;IACL,CAAC;CAEF,CAAA;AArCY,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,6BAAmB,GAAE,CAAA;qCACE,uBAAa;QAGtB,6DAA4B;QACvB,gBAAS;GAPpB,yBAAyB,CAqCrC","sourcesContent":["import { Injectable } from '@nestjs/common';\nimport { ModuleRef } from \"@nestjs/core\";\nimport { InjectEntityManager } from '@nestjs/typeorm';\nimport { CRUDService } from 'src/services/crud.service';\nimport { EntityManager, In } from 'typeorm';\n\n\nimport { PermissionMetadataRepository } from 'src/repository/permission-metadata.repository';\nimport { PermissionMetadata } from '../entities/permission-metadata.entity';\n\n@Injectable()\nexport class PermissionMetadataService extends CRUDService<PermissionMetadata> {\n  constructor(\n    @InjectEntityManager()\n    readonly entityManager: EntityManager,\n    // @InjectRepository(PermissionMetadata, 'default')\n    // readonly repo: Repository<PermissionMetadata>,\n    readonly repo: PermissionMetadataRepository,\n    readonly moduleRef: ModuleRef\n\n  ) {\n    super(entityManager, repo, 'permissionMetadata', 'solid-core',moduleRef);\n  }\n\n\n  findAllUsingRoles(roles: string[]) {\n    return this.repo.find({\n      where: {\n        roles: {\n          name: In(roles)\n        }\n      },\n      relations: {}\n    });\n  }\n\n  permissionExistsInRole(role: string, permission: string,) {\n    return this.repo.find({\n      where: {\n        name: permission,\n        roles: {\n          name: role\n        }\n      },\n      relations: {}\n    });\n  }\n\n}\n\n\n"]}
+{"version":3,"file":"permission-metadata.service.js","sourceRoot":"","sources":["../../src/services/permission-metadata.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Inject, Injectable, Logger } from '@nestjs/common';\nimport { CACHE_MANAGER } from '@nestjs/cache-manager';\nimport { ModuleRef } from \"@nestjs/core\";\nimport { InjectEntityManager } from '@nestjs/typeorm';\nimport { Cache } from 'cache-manager';\nimport { CRUDService } from 'src/services/crud.service';\nimport { shouldUseCache } from 'src/helpers/cache.helper';\nimport { EntityManager, In } from 'typeorm';\n\n\nimport { PermissionMetadataRepository } from 'src/repository/permission-metadata.repository';\nimport { PermissionMetadata } from '../entities/permission-metadata.entity';\n\n@Injectable()\nexport class PermissionMetadataService extends CRUDService<PermissionMetadata> {\n  private readonly logger = new Logger(PermissionMetadataService.name);\n  constructor(\n    @InjectEntityManager()\n    readonly entityManager: EntityManager,\n    // @InjectRepository(PermissionMetadata, 'default')\n    // readonly repo: Repository<PermissionMetadata>,\n    readonly repo: PermissionMetadataRepository,\n    readonly moduleRef: ModuleRef,\n    @Inject(CACHE_MANAGER) private readonly cacheManager: Cache,\n  ) {\n    super(entityManager, repo, 'permissionMetadata', 'solid-core',moduleRef);\n  }\n\n  private buildPermissionsByRoleCacheKey(roleName: string): string {\n    return `permissions:role:${roleName}`;\n  }\n\n  async findAllUsingRoles(roles: string[]): Promise<PermissionMetadata[]> {\n    const useCache = shouldUseCache();\n    const cached: PermissionMetadata[] = [];\n    const uncachedRoles: string[] = [];\n\n    if (useCache) {\n      for (const role of roles) {\n        const cacheKey = this.buildPermissionsByRoleCacheKey(role);\n        const hit = await this.cacheManager.get<PermissionMetadata[]>(cacheKey);\n        if (hit) {\n          // this.logger.debug(`Cache hit for findAllUsingRoles: key=${cacheKey}`);\n          cached.push(...hit);\n        } else {\n          // this.logger.debug(`Cache miss for findAllUsingRoles: key=${cacheKey}`);\n          uncachedRoles.push(role);\n        }\n      }\n    } else {\n      uncachedRoles.push(...roles);\n    }\n\n    if (uncachedRoles.length === 0) {\n      return cached;\n    }\n\n    const fromDb = await this.repo.find({\n      where: { roles: { name: In(uncachedRoles) } },\n      relations: { roles: true },\n    });\n\n    if (useCache) {\n      for (const role of uncachedRoles) {\n        const permsForRole = fromDb.filter(p => p.roles?.some(r => r.name === role));\n        await this.cacheManager.set(this.buildPermissionsByRoleCacheKey(role), permsForRole);\n      }\n    }\n\n    const seen = new Set<number>();\n    return [...cached, ...fromDb].filter(p => {\n      if (seen.has(p.id)) return false;\n      seen.add(p.id);\n      return true;\n    });\n  }\n\n  async permissionExistsInRole(role: string, permission: string): Promise<PermissionMetadata[]> {\n    const useCache = shouldUseCache();\n    const cacheKey = this.buildPermissionsByRoleCacheKey(role);\n\n    if (useCache) {\n      const hit = await this.cacheManager.get<PermissionMetadata[]>(cacheKey);\n      if (hit) {\n        // this.logger.debug(`Cache hit for permissionExistsInRole: key=${cacheKey}`);\n        return hit.filter(p => p.name === permission);\n      }\n      // this.logger.debug(`Cache miss for permissionExistsInRole: key=${cacheKey}`);\n    }\n\n    const fromDb = await this.repo.find({\n      where: { roles: { name: role } },\n      relations: { roles: true },\n    });\n\n    if (useCache) {\n      await this.cacheManager.set(cacheKey, fromDb);\n    }\n\n    return fromDb.filter(p => p.name === permission);\n  }\n\n}\n\n"]}

package/dist/services/queues/database-subscriber.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"database-subscriber.service.d.ts","sourceRoot":"","sources":["../../../src/services/queues/database-subscriber.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGlD,8BAAsB,kBAAkB,CAAC,CAAC,CAAE,YAAW,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC;IAM/E,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IACrD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IAC/D,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa;IAP5C,OAAO,CAAC,eAAe,CAAC,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;gBAGd,gBAAgB,EAAE,gBAAgB,EAClC,qBAAqB,EAAE,qBAAqB,EAC5C,MAAM,EAAE,aAAa;IAS5C,SAAS,KAAK,aAAa,IAAI,MAAM,CAEpC;IAED,SAAS,KAAK,MAAM,IAAI,MAAM,CAK7B;IAED,QAAQ,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;IAE3C,QAAQ,CAAC,OAAO,IAAI,mBAAmB;YAEzB,WAAW;IA6CnB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAqCnC,eAAe;cAUC,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;YAazD,YAAY;YAsBZ,sBAAsB;CAoCvC"}
+{"version":3,"file":"database-subscriber.service.d.ts","sourceRoot":"","sources":["../../../src/services/queues/database-subscriber.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGlD,8BAAsB,kBAAkB,CAAC,CAAC,CAAE,YAAW,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC;IAM/E,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IACrD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IAC/D,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa;IAP5C,OAAO,CAAC,eAAe,CAAC,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;gBAGd,gBAAgB,EAAE,gBAAgB,EAClC,qBAAqB,EAAE,qBAAqB,EAC5C,MAAM,EAAE,aAAa;IAS5C,SAAS,KAAK,aAAa,IAAI,MAAM,CAEpC;IAED,SAAS,KAAK,MAAM,IAAI,MAAM,CAK7B;IAED,QAAQ,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;IAE3C,QAAQ,CAAC,OAAO,IAAI,mBAAmB;YAEzB,WAAW;IA6CnB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IA2CnC,eAAe;cAUC,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;YAazD,YAAY;YAsBZ,sBAAsB;CAoCvC"}

package/dist/services/queues/database-subscriber.service.js

@@ -61,7 +61,12 @@ class DatabaseSubscriber {
         const defaultBroker = process.env.QUEUES_DEFAULT_BROKER || 'database';
         const solidCliRunning = process.env.SOLID_CLI_RUNNING || "false";
         const queueNameRegex = (process.env.QUEUES_QUEUE_NAME_REGEX_TO_ENABLE || '').trim();
-        if (['both', 'subscriber'].includes(this.serviceRole) && defaultBroker === 'database' && solidCliRunning === "false") {
+        const roleAllowed = ['both', 'subscriber'].includes(this.serviceRole);
+        if (!roleAllowed) {
+            this.logger.log(`DatabaseSubscriber is disabled because QUEUES_SERVICE_ROLE is "${this.serviceRole}". Expected "both" or "subscriber".`);
+            return;
+        }
+        if (defaultBroker === 'database' && solidCliRunning === "false") {
             const options = this.options();
             const queueName = options.queueName;
             if (queueNameRegex && queueNameRegex !== "all") {

package/dist/services/queues/database-subscriber.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"database-subscriber.service.js","sourceRoot":"","sources":["../../../src/services/queues/database-subscriber.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Logger, OnModuleInit } from '@nestjs/common';\nimport { QueuesModuleOptions } from \"../../interfaces\";\nimport { QueueMessage, QueueSubscriber } from '../../interfaces/mq';\nimport { MqMessageQueueService } from '../mq-message-queue.service';\nimport { MqMessageService } from '../mq-message.service';\nimport { PollerService } from '../poller.service';\nimport { buildNamespacedQueueName } from './common';\n\nexport abstract class DatabaseSubscriber<T> implements OnModuleInit, QueueSubscriber<T> {\n    private _loggerInstance?: Logger;\n    private readonly url: string;\n    private readonly serviceRole: string;\n\n    constructor(\n        protected readonly mqMessageService: MqMessageService,\n        protected readonly mqMessageQueueService: MqMessageQueueService,\n        protected readonly poller: PollerService,\n    ) {\n        this.serviceRole = process.env.QUEUES_SERVICE_ROLE;\n        if (!this.serviceRole) {\n            this.logger.debug('Queue service Role is not defined in the environment variables');\n        }\n        // this.logger.debug(`DatabaseSubscriber instance created with options: ${JSON.stringify(this.options())}`);\n    }\n\n    protected get loggerContext(): string {\n        return this.constructor.name;\n    }\n\n    protected get logger(): Logger {\n        if (!this._loggerInstance) {\n            this._loggerInstance = new Logger(this.loggerContext);\n        }\n        return this._loggerInstance;\n    }\n\n    abstract subscribe(message: QueueMessage<T>);\n\n    abstract options(): QueuesModuleOptions;\n\n    private async processNext(queueName: string) {\n        // this.logger.debug(`#### DatabaseSubscriber processing next message from queue: ${queueName}`);\n        const job = await this.mqMessageService.lockNextPendingMessage(queueName);\n        if (!job) {\n            return;\n        }\n\n        const messageContentString = job.input.toString();\n        // this.logger.debug(`DatabaseSubscriber Received raw message: ${messageContentString}`);\n\n        let message: QueueMessage<T> = null;\n\n        try {\n            message = JSON.parse(messageContentString) as QueueMessage<T>;\n\n            // this is the first time we are receiving the message so we set the currentRetry to 0\n            if (!message.retryCount) message.retryCount = 0;\n            if (!message.retryInterval) message.retryInterval = 1000;\n            if (!message.currentRetry) message.currentRetry = 0;\n\n            await this.processMessage(message);\n        }\n        catch (error) {\n            this.logger.error(`Error processing message: ${error.message}`);\n\n            // if an error occurs then if retryCount is set we start retrying. \n            if (message) {\n                if (message.currentRetry < message.retryCount) {\n                    await this.updateStatusInDatabase('retrying', message);\n\n                    message.currentRetry++;\n                    this.logger.warn(`Retrying message (${message.currentRetry}/${message.retryCount}) after ${message.retryInterval}ms`);\n                    setTimeout(() => {\n                        this.retryMessage(message);\n                    }, message.retryInterval);\n                } else {\n                    // Discard the message after max retries\n                    await this.updateStatusInDatabase('failed', message, error.message, '');\n                    this.logger.error(`Message failed after ${message.retryCount} attempts: ${error.message}`);\n                }\n            }\n        }\n        // this.logger.debug(`#### DatabaseSubscriber finished processing message from queue: ${queueName}`);\n    }\n\n    async onModuleInit(): Promise<void> {\n        // Not using SettingService here as that will necessitate all implementors of DatabaseSubscriber to also inject SettingService which is not ideal. \n        // Instead we directly read the environment variables here.\n        const defaultBroker = process.env.QUEUES_DEFAULT_BROKER || 'database';\n        const solidCliRunning = process.env.SOLID_CLI_RUNNING || \"false\";\n        const queueNameRegex = (process.env.QUEUES_QUEUE_NAME_REGEX_TO_ENABLE || '').trim();\n\n        // we will start subscriber only if the current service role is subscriber. \n        if (['both', 'subscriber'].includes(this.serviceRole) && defaultBroker === 'database' && solidCliRunning === \"false\") {\n            const options = this.options();\n            const queueName = options.queueName;\n\n            if (queueNameRegex && queueNameRegex !== \"all\") {\n                try {\n                    const regex = new RegExp(queueNameRegex);\n                    if (!regex.test(queueName)) {\n                        this.logger.log(`DatabaseSubscriber for queue ${queueName} is disabled because it does not match QUEUES_QUEUE_NAME_REGEX_TO_ENABLE=${queueNameRegex}`);\n                        return;\n                    }\n                } catch (error) {\n                    this.logger.error(`Invalid QUEUES_QUEUE_NAME_REGEX_TO_ENABLE regex \"${queueNameRegex}\". Subscriber for queue ${queueName} will not start.`);\n                    return;\n                }\n            }\n\n            const namespacedQueueName = buildNamespacedQueueName(queueName);\n            this.poller.start(namespacedQueueName, (q) => this.processNext(q), {\n                baseDelayMs: 1000,\n                maxDelayMs: 30_000,\n                timeoutPerIterationMs: 5 * 60_000,\n                jitter: true,\n            });\n\n            this.logger.log(`DatabaseSubscriber ready to consume messages: ${JSON.stringify(this.options())}`);\n        }\n    }\n\n    onModuleDestroy() {\n        const options = this.options();\n        const queueName = options.queueName;\n        const namespacedQueueName = buildNamespacedQueueName(queueName);\n        this.poller.stop(namespacedQueueName);\n    }\n\n    /**\n     * Abstract method for message processing logic.\n     */\n    protected async processMessage(message: QueueMessage<T>): Promise<void> {\n        await this.updateStatusInDatabase('started', message);\n\n        // Capture the results of handling the task.\n        const result = await this.subscribe(message);\n\n        // TODO: Update the database to indicate that the task is finished.\n        await this.updateStatusInDatabase('succeeded', message, '', result ? JSON.stringify(result, null, 2) : '');\n    }\n\n    /**\n     * Retry the message by invoking the processing logic again.\n     */\n    private async retryMessage(message: QueueMessage<T>) {\n        try {\n            await this.processMessage(message);\n        } catch (error) {\n            if (message.currentRetry < message.retryCount) {\n                await this.updateStatusInDatabase('retrying', message);\n\n                message.currentRetry++;\n                this.logger.warn(`Retrying message (${message.currentRetry}/${message.retryCount}) after ${message.retryInterval}ms: ${error.message}`);\n                setTimeout(() => {\n                    this.retryMessage(message);\n                }, message.retryInterval);\n            } else {\n                this.logger.error(`Message failed after ${message.retryCount} attempts: ${error.message}`);\n\n                // TODO: Store the error in the database and update the status accordingly.\n                await this.updateStatusInDatabase('failed', message, error.message, '');\n\n            }\n        }\n    }\n\n    private async updateStatusInDatabase(stage: string, message: QueueMessage<T>, error: string = '', result: string = '') {\n        try {\n            this.logger.debug(`Updating message status in database: ${stage} for messageId: ${message.messageId}`);\n\n            // 1. resolve the queue first\n            const mqMessage = await this.mqMessageService.repo.findOne({\n                where: {\n                    messageId: message.messageId,\n                }\n            });\n\n            if (mqMessage) {\n                this.logger.debug(`Found message in database: ${JSON.stringify(mqMessage.messageId)}`);\n                this.logger.debug(`Updating message status in database: ${stage} for messageId: ${mqMessage.id}`);\n\n                const updatedFields = {\n                    stage: stage\n                };\n                if (stage === 'failed' || stage === 'succeeded') {\n                    updatedFields['finishedAt'] = new Date();\n                    updatedFields['elapsedMillis'] = updatedFields['finishedAt'].getTime() - mqMessage.startedAt.getTime();\n                }\n                if (stage === 'succeeded') {\n                    updatedFields['output'] = result;\n                }\n                if (stage === 'failed') {\n                    updatedFields['error'] = error;\n                }\n                await this.mqMessageService.repo.update(mqMessage.id, updatedFields);\n                this.logger.debug(`Message status updated to ${stage} for messageId: ${mqMessage.id}`);\n            }\n        }\n        catch (error) {\n            this.logger.error(error.message, error.stack);\n        }\n    }\n}\n"]}
+{"version":3,"file":"database-subscriber.service.js","sourceRoot":"","sources":["../../../src/services/queues/database-subscriber.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Logger, OnModuleInit } from '@nestjs/common';\nimport { QueuesModuleOptions } from \"../../interfaces\";\nimport { QueueMessage, QueueSubscriber } from '../../interfaces/mq';\nimport { MqMessageQueueService } from '../mq-message-queue.service';\nimport { MqMessageService } from '../mq-message.service';\nimport { PollerService } from '../poller.service';\nimport { buildNamespacedQueueName } from './common';\n\nexport abstract class DatabaseSubscriber<T> implements OnModuleInit, QueueSubscriber<T> {\n    private _loggerInstance?: Logger;\n    private readonly url: string;\n    private readonly serviceRole: string;\n\n    constructor(\n        protected readonly mqMessageService: MqMessageService,\n        protected readonly mqMessageQueueService: MqMessageQueueService,\n        protected readonly poller: PollerService,\n    ) {\n        this.serviceRole = process.env.QUEUES_SERVICE_ROLE;\n        if (!this.serviceRole) {\n            this.logger.debug('Queue service Role is not defined in the environment variables');\n        }\n        // this.logger.debug(`DatabaseSubscriber instance created with options: ${JSON.stringify(this.options())}`);\n    }\n\n    protected get loggerContext(): string {\n        return this.constructor.name;\n    }\n\n    protected get logger(): Logger {\n        if (!this._loggerInstance) {\n            this._loggerInstance = new Logger(this.loggerContext);\n        }\n        return this._loggerInstance;\n    }\n\n    abstract subscribe(message: QueueMessage<T>);\n\n    abstract options(): QueuesModuleOptions;\n\n    private async processNext(queueName: string) {\n        // this.logger.debug(`#### DatabaseSubscriber processing next message from queue: ${queueName}`);\n        const job = await this.mqMessageService.lockNextPendingMessage(queueName);\n        if (!job) {\n            return;\n        }\n\n        const messageContentString = job.input.toString();\n        // this.logger.debug(`DatabaseSubscriber Received raw message: ${messageContentString}`);\n\n        let message: QueueMessage<T> = null;\n\n        try {\n            message = JSON.parse(messageContentString) as QueueMessage<T>;\n\n            // this is the first time we are receiving the message so we set the currentRetry to 0\n            if (!message.retryCount) message.retryCount = 0;\n            if (!message.retryInterval) message.retryInterval = 1000;\n            if (!message.currentRetry) message.currentRetry = 0;\n\n            await this.processMessage(message);\n        }\n        catch (error) {\n            this.logger.error(`Error processing message: ${error.message}`);\n\n            // if an error occurs then if retryCount is set we start retrying. \n            if (message) {\n                if (message.currentRetry < message.retryCount) {\n                    await this.updateStatusInDatabase('retrying', message);\n\n                    message.currentRetry++;\n                    this.logger.warn(`Retrying message (${message.currentRetry}/${message.retryCount}) after ${message.retryInterval}ms`);\n                    setTimeout(() => {\n                        this.retryMessage(message);\n                    }, message.retryInterval);\n                } else {\n                    // Discard the message after max retries\n                    await this.updateStatusInDatabase('failed', message, error.message, '');\n                    this.logger.error(`Message failed after ${message.retryCount} attempts: ${error.message}`);\n                }\n            }\n        }\n        // this.logger.debug(`#### DatabaseSubscriber finished processing message from queue: ${queueName}`);\n    }\n\n    async onModuleInit(): Promise<void> {\n        // Not using SettingService here as that will necessitate all implementors of DatabaseSubscriber to also inject SettingService which is not ideal. \n        // Instead we directly read the environment variables here.\n        const defaultBroker = process.env.QUEUES_DEFAULT_BROKER || 'database';\n        const solidCliRunning = process.env.SOLID_CLI_RUNNING || \"false\";\n        const queueNameRegex = (process.env.QUEUES_QUEUE_NAME_REGEX_TO_ENABLE || '').trim();\n        const roleAllowed = ['both', 'subscriber'].includes(this.serviceRole);\n\n        if (!roleAllowed) {\n            this.logger.log(`DatabaseSubscriber is disabled because QUEUES_SERVICE_ROLE is \"${this.serviceRole}\". Expected \"both\" or \"subscriber\".`);\n            return;\n        }\n\n        // we will start subscriber only if the current service role is subscriber. \n        if (defaultBroker === 'database' && solidCliRunning === \"false\") {\n            const options = this.options();\n            const queueName = options.queueName;\n\n            if (queueNameRegex && queueNameRegex !== \"all\") {\n                try {\n                    const regex = new RegExp(queueNameRegex);\n                    if (!regex.test(queueName)) {\n                        this.logger.log(`DatabaseSubscriber for queue ${queueName} is disabled because it does not match QUEUES_QUEUE_NAME_REGEX_TO_ENABLE=${queueNameRegex}`);\n                        return;\n                    }\n                } catch (error) {\n                    this.logger.error(`Invalid QUEUES_QUEUE_NAME_REGEX_TO_ENABLE regex \"${queueNameRegex}\". Subscriber for queue ${queueName} will not start.`);\n                    return;\n                }\n            }\n\n            const namespacedQueueName = buildNamespacedQueueName(queueName);\n            this.poller.start(namespacedQueueName, (q) => this.processNext(q), {\n                baseDelayMs: 1000,\n                maxDelayMs: 30_000,\n                timeoutPerIterationMs: 5 * 60_000,\n                jitter: true,\n            });\n\n            this.logger.log(`DatabaseSubscriber ready to consume messages: ${JSON.stringify(this.options())}`);\n        }\n    }\n\n    onModuleDestroy() {\n        const options = this.options();\n        const queueName = options.queueName;\n        const namespacedQueueName = buildNamespacedQueueName(queueName);\n        this.poller.stop(namespacedQueueName);\n    }\n\n    /**\n     * Abstract method for message processing logic.\n     */\n    protected async processMessage(message: QueueMessage<T>): Promise<void> {\n        await this.updateStatusInDatabase('started', message);\n\n        // Capture the results of handling the task.\n        const result = await this.subscribe(message);\n\n        // TODO: Update the database to indicate that the task is finished.\n        await this.updateStatusInDatabase('succeeded', message, '', result ? JSON.stringify(result, null, 2) : '');\n    }\n\n    /**\n     * Retry the message by invoking the processing logic again.\n     */\n    private async retryMessage(message: QueueMessage<T>) {\n        try {\n            await this.processMessage(message);\n        } catch (error) {\n            if (message.currentRetry < message.retryCount) {\n                await this.updateStatusInDatabase('retrying', message);\n\n                message.currentRetry++;\n                this.logger.warn(`Retrying message (${message.currentRetry}/${message.retryCount}) after ${message.retryInterval}ms: ${error.message}`);\n                setTimeout(() => {\n                    this.retryMessage(message);\n                }, message.retryInterval);\n            } else {\n                this.logger.error(`Message failed after ${message.retryCount} attempts: ${error.message}`);\n\n                // TODO: Store the error in the database and update the status accordingly.\n                await this.updateStatusInDatabase('failed', message, error.message, '');\n\n            }\n        }\n    }\n\n    private async updateStatusInDatabase(stage: string, message: QueueMessage<T>, error: string = '', result: string = '') {\n        try {\n            this.logger.debug(`Updating message status in database: ${stage} for messageId: ${message.messageId}`);\n\n            // 1. resolve the queue first\n            const mqMessage = await this.mqMessageService.repo.findOne({\n                where: {\n                    messageId: message.messageId,\n                }\n            });\n\n            if (mqMessage) {\n                this.logger.debug(`Found message in database: ${JSON.stringify(mqMessage.messageId)}`);\n                this.logger.debug(`Updating message status in database: ${stage} for messageId: ${mqMessage.id}`);\n\n                const updatedFields = {\n                    stage: stage\n                };\n                if (stage === 'failed' || stage === 'succeeded') {\n                    updatedFields['finishedAt'] = new Date();\n                    updatedFields['elapsedMillis'] = updatedFields['finishedAt'].getTime() - mqMessage.startedAt.getTime();\n                }\n                if (stage === 'succeeded') {\n                    updatedFields['output'] = result;\n                }\n                if (stage === 'failed') {\n                    updatedFields['error'] = error;\n                }\n                await this.mqMessageService.repo.update(mqMessage.id, updatedFields);\n                this.logger.debug(`Message status updated to ${stage} for messageId: ${mqMessage.id}`);\n            }\n        }\n        catch (error) {\n            this.logger.error(error.message, error.stack);\n        }\n    }\n}\n"]}

package/dist/services/queues/publisher-factory.service.js

@@ -34,7 +34,6 @@ let PublisherFactory = PublisherFactory_1 = class PublisherFactory {
             throw new Error(`Unable to locate publisher with name ${resolvedPublisherName}`);
         }
         const typedActualPublisher = actualPublisherToUse.instance;
-        this.logger.debug(`Resolved publisher with name ${actualPublisherToUse.name}, and with options: ${JSON.stringify(typedActualPublisher.options())}`);
         return typedActualPublisher.publish(message);
     }
 };

package/dist/services/queues/publisher-factory.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"publisher-factory.service.js","sourceRoot":"","sources":["../../../src/services/queues/publisher-factory.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA4D;AAC5D,2CAA4C;AAG5C,oEAAkE;AAClE,0EAAqE;AAI9D,IAAM,gBAAgB,wBAAtB,MAAM,gBAAgB;IAGzB,YAEI,yBAAkE;QAAjD,8BAAyB,GAAzB,yBAAyB,CAAwB;QAJrD,WAAM,GAAG,IAAI,eAAM,CAAC,kBAAgB,CAAC,IAAI,CAAC,CAAC;IAM5D,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAwB,EAAE,aAAqB,EAAE,WAAoB;QAC/E,IAAI,kBAAkB,GAAG,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,UAAU,CAAC;QACxF,IAAI,qBAAqB,GAAG,GAAG,aAAa,GAAG,IAAA,kBAAQ,EAAC,kBAAkB,CAAC,EAAE,CAAC;QAG9E,IAAI,oBAAoB,GAAG,IAAI,CAAC,yBAAyB,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;QAC7F,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAExB,oBAAoB,GAAG,IAAI,CAAC,yBAAyB,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;QAMrF,CAAC;QACD,IAAI,CAAC,oBAAoB,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,wCAAwC,qBAAqB,EAAE,CAAC,CAAC;QACrF,CAAC;QAGD,MAAM,oBAAoB,GAAsB,oBAAoB,CAAC,QAAQ,CAAC;QAC9E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,oBAAoB,CAAC,IAAI,uBAAuB,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;QAEpJ,OAAO,oBAAoB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;CACJ,CAAA;AAlCY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;IAKJ,WAAA,IAAA,eAAM,EAAC,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,iDAAsB,CAAC,CAAC,CAAA;qCACL,iDAAsB;GAL7D,gBAAgB,CAkC5B","sourcesContent":["import { forwardRef, Inject, Logger } from '@nestjs/common';\nimport { Injectable } from '@nestjs/common';\n\nimport { QueueMessage, QueuePublisher } from 'src/interfaces/mq';\nimport { classify } from '@angular-devkit/core/src/utils/strings';\nimport { SolidIntrospectService } from '../solid-introspect.service';\n\n\n@Injectable()\nexport class PublisherFactory<T> {\n    private readonly logger = new Logger(PublisherFactory.name);\n\n    constructor(\n        @Inject(forwardRef(() => SolidIntrospectService))\n        private readonly solidIntrospectionService: SolidIntrospectService\n    ) {\n    }\n\n    async publish(message: QueueMessage<T>, publisherName: string, brokerToUse?: string): Promise<string> {\n        let defaultBrokerToUse = brokerToUse || process.env.QUEUES_DEFAULT_BROKER || \"database\";\n        let resolvedPublisherName = `${publisherName}${classify(defaultBrokerToUse)}`;\n\n        // Register all ISolidDatabaseModules implementations\n        let actualPublisherToUse = this.solidIntrospectionService.getProvider(resolvedPublisherName);\n        if (!actualPublisherToUse) {\n            // Relaxed extra check in place to make sure we do not have to refactor old publishers or publishers named without the ____RabbitMq or ____Database convention\n            actualPublisherToUse = this.solidIntrospectionService.getProvider(publisherName);\n\n            // Extra check in place to make sure we do not have to refactor old publishers which have been created earlier. \n            // if (defaultBrokerToUse === 'rabbitmq') {\n            //     actualPublisherToUse = this.solidIntrospectionService.getProvider(publisherName);\n            // }\n        }\n        if (!actualPublisherToUse) {\n            throw new Error(`Unable to locate publisher with name ${resolvedPublisherName}`);\n        }\n\n        // type safe\n        const typedActualPublisher: QueuePublisher<T> = actualPublisherToUse.instance;\n        this.logger.debug(`Resolved publisher with name ${actualPublisherToUse.name}, and with options: ${JSON.stringify(typedActualPublisher.options())}`);\n\n        return typedActualPublisher.publish(message);\n    }\n}\n"]}
+{"version":3,"file":"publisher-factory.service.js","sourceRoot":"","sources":["../../../src/services/queues/publisher-factory.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA4D;AAC5D,2CAA4C;AAG5C,oEAAkE;AAClE,0EAAqE;AAI9D,IAAM,gBAAgB,wBAAtB,MAAM,gBAAgB;IAGzB,YAEI,yBAAkE;QAAjD,8BAAyB,GAAzB,yBAAyB,CAAwB;QAJrD,WAAM,GAAG,IAAI,eAAM,CAAC,kBAAgB,CAAC,IAAI,CAAC,CAAC;IAM5D,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAwB,EAAE,aAAqB,EAAE,WAAoB;QAC/E,IAAI,kBAAkB,GAAG,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,UAAU,CAAC;QACxF,IAAI,qBAAqB,GAAG,GAAG,aAAa,GAAG,IAAA,kBAAQ,EAAC,kBAAkB,CAAC,EAAE,CAAC;QAG9E,IAAI,oBAAoB,GAAG,IAAI,CAAC,yBAAyB,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;QAC7F,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAExB,oBAAoB,GAAG,IAAI,CAAC,yBAAyB,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;QAMrF,CAAC;QACD,IAAI,CAAC,oBAAoB,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,wCAAwC,qBAAqB,EAAE,CAAC,CAAC;QACrF,CAAC;QAGD,MAAM,oBAAoB,GAAsB,oBAAoB,CAAC,QAAQ,CAAC;QAG9E,OAAO,oBAAoB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;CACJ,CAAA;AAlCY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;IAKJ,WAAA,IAAA,eAAM,EAAC,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,iDAAsB,CAAC,CAAC,CAAA;qCACL,iDAAsB;GAL7D,gBAAgB,CAkC5B","sourcesContent":["import { forwardRef, Inject, Logger } from '@nestjs/common';\nimport { Injectable } from '@nestjs/common';\n\nimport { QueueMessage, QueuePublisher } from 'src/interfaces/mq';\nimport { classify } from '@angular-devkit/core/src/utils/strings';\nimport { SolidIntrospectService } from '../solid-introspect.service';\n\n\n@Injectable()\nexport class PublisherFactory<T> {\n    private readonly logger = new Logger(PublisherFactory.name);\n\n    constructor(\n        @Inject(forwardRef(() => SolidIntrospectService))\n        private readonly solidIntrospectionService: SolidIntrospectService\n    ) {\n    }\n\n    async publish(message: QueueMessage<T>, publisherName: string, brokerToUse?: string): Promise<string> {\n        let defaultBrokerToUse = brokerToUse || process.env.QUEUES_DEFAULT_BROKER || \"database\";\n        let resolvedPublisherName = `${publisherName}${classify(defaultBrokerToUse)}`;\n\n        // Register all ISolidDatabaseModules implementations\n        let actualPublisherToUse = this.solidIntrospectionService.getProvider(resolvedPublisherName);\n        if (!actualPublisherToUse) {\n            // Relaxed extra check in place to make sure we do not have to refactor old publishers or publishers named without the ____RabbitMq or ____Database convention\n            actualPublisherToUse = this.solidIntrospectionService.getProvider(publisherName);\n\n            // Extra check in place to make sure we do not have to refactor old publishers which have been created earlier. \n            // if (defaultBrokerToUse === 'rabbitmq') {\n            //     actualPublisherToUse = this.solidIntrospectionService.getProvider(publisherName);\n            // }\n        }\n        if (!actualPublisherToUse) {\n            throw new Error(`Unable to locate publisher with name ${resolvedPublisherName}`);\n        }\n\n        // type safe\n        const typedActualPublisher: QueuePublisher<T> = actualPublisherToUse.instance;\n        // this.logger.debug(`Resolved publisher with name ${actualPublisherToUse.name}, and with options: ${JSON.stringify(typedActualPublisher.options())}`);\n\n        return typedActualPublisher.publish(message);\n    }\n}\n"]}

package/dist/services/queues/rabbitmq-publisher.service.d.ts

@@ -14,6 +14,7 @@ export declare abstract class RabbitMqPublisher<T> implements OnModuleDestroy, Q
     private connectingPromise;
     constructor(mqMessageService: MqMessageService, mqMessageQueueService: MqMessageQueueService);
     abstract options(): QueuesModuleOptions;
+    protected shouldPersistToDatabase(): boolean;
     private ensureConnectionAndChannel;
     onModuleDestroy(): Promise<void>;
     private closeConnectionAndChannel;

package/dist/services/queues/rabbitmq-publisher.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rabbitmq-publisher.service.d.ts","sourceRoot":"","sources":["../../../src/services/queues/rabbitmq-publisher.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGzD,8BAAsB,iBAAiB,CAAC,CAAC,CAAE,YAAW,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC;IAWhF,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IACrD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IAXnE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsC;IAC7D,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IAGrC,OAAO,CAAC,UAAU,CAAgC;IAClD,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,iBAAiB,CAA8B;gBAGhC,gBAAgB,EAAE,gBAAgB,EAClC,qBAAqB,EAAE,qBAAqB;IAanE,QAAQ,CAAC,OAAO,IAAI,mBAAmB;YAEzB,0BAA0B;IAwElC,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;YAIxB,yBAAyB;IA0BjC,OAAO,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;YA6D1C,iBAAiB;CA0BlC"}
+{"version":3,"file":"rabbitmq-publisher.service.d.ts","sourceRoot":"","sources":["../../../src/services/queues/rabbitmq-publisher.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGzD,8BAAsB,iBAAiB,CAAC,CAAC,CAAE,YAAW,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC;IAWhF,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IACrD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IAXnE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsC;IAC7D,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IAGrC,OAAO,CAAC,UAAU,CAAgC;IAClD,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,iBAAiB,CAA8B;gBAGhC,gBAAgB,EAAE,gBAAgB,EAClC,qBAAqB,EAAE,qBAAqB;IAanE,QAAQ,CAAC,OAAO,IAAI,mBAAmB;IAEvC,SAAS,CAAC,uBAAuB,IAAI,OAAO;YAI9B,0BAA0B;IAwElC,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;YAIxB,yBAAyB;IA0BjC,OAAO,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;YA+D1C,iBAAiB;CA0BlC"}

package/dist/services/queues/rabbitmq-publisher.service.js

@@ -55,6 +55,9 @@ class RabbitMqPublisher {
             this.logger.debug('Queue service Role is not defined in the environment variables');
         }
     }
+    shouldPersistToDatabase() {
+        return this.options().persistToDatabase ?? true;
+    }
     async ensureConnectionAndChannel() {
         if (this.channel) {
             return this.channel;
@@ -160,7 +163,9 @@ class RabbitMqPublisher {
         if (!message.retryInterval)
             message.retryInterval = 1000;
         message.messageId = (0, uuid_1.v4)();
-        await this.persistToDatabase(namespacedQueueName, message);
+        if (this.shouldPersistToDatabase()) {
+            await this.persistToDatabase(namespacedQueueName, message);
+        }
         try {
             const publishStatus = channel.publish(exchangeName, routingKey, Buffer.from(JSON.stringify(message)), { mandatory: true });
         }

package/dist/services/queues/rabbitmq-publisher.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"rabbitmq-publisher.service.js","sourceRoot":"","sources":["../../../src/services/queues/rabbitmq-publisher.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Logger, OnModuleDestroy } from '@nestjs/common';\nimport * as amqp from 'amqplib';\nimport { v4 as uuidv4 } from 'uuid';\nimport { QueuesModuleOptions } from \"../../interfaces\";\nimport { QueueMessage, QueuePublisher } from '../../interfaces/mq';\nimport { MqMessageQueueService } from '../mq-message-queue.service';\nimport { MqMessageService } from '../mq-message.service';\nimport { buildNamespacedQueueName } from './common';\n\nexport abstract class RabbitMqPublisher<T> implements OnModuleDestroy, QueuePublisher<T> {\n    private readonly logger = new Logger(RabbitMqPublisher.name);\n    private readonly url: string;\n    private readonly serviceRole: string;\n\n    // Maintain connection...\n    private connection: amqp.Connection | null = null;\n    private channel: amqp.Channel | null = null;\n    private connectingPromise: Promise<void> | null = null;\n\n    constructor(\n        protected readonly mqMessageService: MqMessageService,\n        protected readonly mqMessageQueueService: MqMessageQueueService,\n    ) {\n        this.url = process.env.QUEUES_RABBIT_MQ_URL;\n        this.serviceRole = process.env.QUEUES_SERVICE_ROLE;\n        if (!this.url) {\n            this.logger.debug('RabbitMqPublisher url is not defined in the environment variables');\n        }\n        if (!this.serviceRole) {\n            this.logger.debug('Queue service Role is not defined in the environment variables');\n        }\n        // this.logger.debug(`RabbitMqPublisher instance created with options: ${JSON.stringify(this.options())} and url: ${this.url}`);\n    }\n\n    abstract options(): QueuesModuleOptions;\n\n    private async ensureConnectionAndChannel(): Promise<amqp.Channel> {\n        if (this.channel) {\n            return this.channel;\n        }\n\n        // If another call is already connecting, wait for it\n        if (this.connectingPromise) {\n            await this.connectingPromise;\n            if (this.channel) return this.channel;\n        }\n\n        this.connectingPromise = (async () => {\n            const url = new URL(this.url);\n\n            const conn = await amqp.connect({\n                protocol: url.protocol.replace(':', ''), // \"amqps\"\n                hostname: url.hostname,\n                port: parseInt(url.port),\n                username: url.username,\n                // Node's URL already decodes percent-encoding; decodeURIComponent is not needed\n                // But without it does not seem to be working...\n                password: decodeURIComponent(url.password),\n                frameMax: 131072,\n            });\n\n            conn.on('error', (err) => {\n                this.logger.error(`RabbitMQ connection error: ${err.message}`, err.stack);\n            });\n\n            conn.on('close', () => {\n                this.logger.warn('RabbitMQ connection closed, resetting');\n                this.connection = null;\n                this.channel = null;\n            });\n\n            const channel = await conn.createChannel();\n\n            channel.on('return', (msg) => {\n                const content = msg.content?.toString?.() ?? '';\n                this.logger.warn(\n                    `RabbitMqPublisher message returned from exchange ${msg.fields.exchange} with routingKey ${msg.fields.routingKey}: ${content}`,\n                );\n            });\n\n            const options = this.options();\n            const queueName = options.queueName;\n            const namespacedQueueName = buildNamespacedQueueName(queueName);\n            const exchangeName = `${namespacedQueueName}.exchange`;\n            const routingKey = `${namespacedQueueName}.routing-key`;\n\n            await channel.assertExchange(exchangeName, 'direct', {});\n            const queue = await channel.assertQueue(namespacedQueueName, {});\n            await channel.bindQueue(queue.queue, exchangeName, routingKey);\n\n            this.connection = conn;\n            this.channel = channel;\n        })();\n\n        try {\n            await this.connectingPromise;\n        } finally {\n            this.connectingPromise = null;\n        }\n\n        if (!this.channel) {\n            throw new Error('Failed to initialize RabbitMQ channel');\n        }\n\n        return this.channel;\n    }\n\n    // Nest will call this for every subclass instance, because they inherit the method\n    async onModuleDestroy(): Promise<void> {\n        await this.closeConnectionAndChannel();\n    }\n\n    private async closeConnectionAndChannel(): Promise<void> {\n        if (this.channel) {\n            try {\n                await this.channel.close();\n            } catch (err) {\n                this.logger.warn(\n                    `RabbitMqPublisher error closing channel: ${(err as Error).message}`,\n                );\n            } finally {\n                this.channel = null;\n            }\n        }\n\n        if (this.connection) {\n            try {\n                await this.connection.close();\n            } catch (err) {\n                this.logger.warn(\n                    `RabbitMqPublisher error closing connection: ${(err as Error).message}`,\n                );\n            } finally {\n                this.connection = null;\n            }\n        }\n    }\n\n    async publish(message: QueueMessage<T>): Promise<string> {\n        if (!this.url) {\n            this.logger.error('RabbitMqPublisher url is not defined in the environment variables');\n            throw new Error('RabbitMqPublisher url is not defined in the environment variables');\n        }\n        if (!this.serviceRole) {\n            this.logger.error('Queue service Role is not defined in the environment variables');\n            throw new Error('Queue service Role is not defined in the environment variables');\n        }\n        if (this.serviceRole === 'subscriber') {\n            this.logger.error('Queue service Role is subscriber, cannot publish messages');\n            throw new Error('Queue service Role is subscriber, cannot publish messages');\n        }\n\n        const channel = await this.ensureConnectionAndChannel();\n        // this.logger.debug(`RabbitMqPublisher publisher channel created options: ${JSON.stringify(this.options())} and url: ${url}`);\n\n        const options = this.options();\n\n        const queueName = options.queueName;\n        const namespacedQueueName = buildNamespacedQueueName(queueName);\n\n        const exchangeName = `${namespacedQueueName}.exchange`;\n        const routingKey = `${namespacedQueueName}.routing-key`;\n\n        // Set default values for retry. \n        // by default there are no retries.\n        if (!message.retryCount) message.retryCount = 0;\n        if (!message.retryInterval) message.retryInterval = 1000;\n\n        // generate a new message id \n        message.messageId = uuidv4();\n\n        // Save the message to the DB so that we can then change its status in the subscriber...\n        await this.persistToDatabase(namespacedQueueName, message);\n\n        // wait for the channel to confirm \n        try {\n            // Publish the message\n            // const publishStatus = channel.publish(exchangeName, routingKey, Buffer.from(JSON.stringify(message)));\n            const publishStatus = channel.publish(exchangeName, routingKey, Buffer.from(JSON.stringify(message)), { mandatory: true });\n            // this.logger.debug(`RabbitMqPublisher publish status: ${JSON.stringify(publishStatus)}`);\n            // if (!publishStatus) {\n            //     this.logger.warn('RabbitMqPublisher Message buffering failed!');\n            // }\n            // await channel.waitForConfirms();\n            // this.logger.debug('RabbitMqPublisher Message published successfully');\n        } catch (err) {\n            this.logger.error(`RabbitMqPublisher Message publish failed: ${JSON.stringify(err)}`);\n            if (err instanceof Error) {\n                this.logger.error(`RabbitMqPublisher Error stack: ${err.stack}`);\n            }\n        }\n        finally {\n        }\n        // this.logger.debug(`Sent message: ${JSON.stringify(message)}`);\n\n        // return the newly created message id.\n        return message.messageId;\n    }\n\n    private async persistToDatabase(queueName: string, message: QueueMessage<T>) {\n\n        // TODO: make an entry in the relevant database table, generate a unique id earlier.\n        try {\n            // 1. resolve the queue first\n            const mqMessageQueue = await this.mqMessageQueueService.resolveQueue(queueName);\n\n            // 2. Next create an entry in the mqMessage table. \n            await this.mqMessageService.create({\n                messageBroker: this.options().type,\n                messageId: message.messageId,\n                retryCount: message.retryCount,\n                retryInterval: message.retryInterval,\n                stage: 'pending',\n                startedAt: new Date(),\n                input: JSON.stringify(message, null, 2),\n                parentEntityId: message.parentEntityId,\n                parentEntity: message.parentEntity,\n                mqMessageQueueId: mqMessageQueue.id,\n            });\n        }\n        catch (error) {\n            this.logger.error(error.message, error.stack);\n        }\n\n    }\n}\n"]}
+{"version":3,"file":"rabbitmq-publisher.service.js","sourceRoot":"","sources":["../../../src/services/queues/rabbitmq-publisher.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Logger, OnModuleDestroy } from '@nestjs/common';\nimport * as amqp from 'amqplib';\nimport { v4 as uuidv4 } from 'uuid';\nimport { QueuesModuleOptions } from \"../../interfaces\";\nimport { QueueMessage, QueuePublisher } from '../../interfaces/mq';\nimport { MqMessageQueueService } from '../mq-message-queue.service';\nimport { MqMessageService } from '../mq-message.service';\nimport { buildNamespacedQueueName } from './common';\n\nexport abstract class RabbitMqPublisher<T> implements OnModuleDestroy, QueuePublisher<T> {\n    private readonly logger = new Logger(RabbitMqPublisher.name);\n    private readonly url: string;\n    private readonly serviceRole: string;\n\n    // Maintain connection...\n    private connection: amqp.Connection | null = null;\n    private channel: amqp.Channel | null = null;\n    private connectingPromise: Promise<void> | null = null;\n\n    constructor(\n        protected readonly mqMessageService: MqMessageService,\n        protected readonly mqMessageQueueService: MqMessageQueueService,\n    ) {\n        this.url = process.env.QUEUES_RABBIT_MQ_URL;\n        this.serviceRole = process.env.QUEUES_SERVICE_ROLE;\n        if (!this.url) {\n            this.logger.debug('RabbitMqPublisher url is not defined in the environment variables');\n        }\n        if (!this.serviceRole) {\n            this.logger.debug('Queue service Role is not defined in the environment variables');\n        }\n        // this.logger.debug(`RabbitMqPublisher instance created with options: ${JSON.stringify(this.options())} and url: ${this.url}`);\n    }\n\n    abstract options(): QueuesModuleOptions;\n\n    protected shouldPersistToDatabase(): boolean {\n        return this.options().persistToDatabase ?? true;\n    }\n\n    private async ensureConnectionAndChannel(): Promise<amqp.Channel> {\n        if (this.channel) {\n            return this.channel;\n        }\n\n        // If another call is already connecting, wait for it\n        if (this.connectingPromise) {\n            await this.connectingPromise;\n            if (this.channel) return this.channel;\n        }\n\n        this.connectingPromise = (async () => {\n            const url = new URL(this.url);\n\n            const conn = await amqp.connect({\n                protocol: url.protocol.replace(':', ''), // \"amqps\"\n                hostname: url.hostname,\n                port: parseInt(url.port),\n                username: url.username,\n                // Node's URL already decodes percent-encoding; decodeURIComponent is not needed\n                // But without it does not seem to be working...\n                password: decodeURIComponent(url.password),\n                frameMax: 131072,\n            });\n\n            conn.on('error', (err) => {\n                this.logger.error(`RabbitMQ connection error: ${err.message}`, err.stack);\n            });\n\n            conn.on('close', () => {\n                this.logger.warn('RabbitMQ connection closed, resetting');\n                this.connection = null;\n                this.channel = null;\n            });\n\n            const channel = await conn.createChannel();\n\n            channel.on('return', (msg) => {\n                const content = msg.content?.toString?.() ?? '';\n                this.logger.warn(\n                    `RabbitMqPublisher message returned from exchange ${msg.fields.exchange} with routingKey ${msg.fields.routingKey}: ${content}`,\n                );\n            });\n\n            const options = this.options();\n            const queueName = options.queueName;\n            const namespacedQueueName = buildNamespacedQueueName(queueName);\n            const exchangeName = `${namespacedQueueName}.exchange`;\n            const routingKey = `${namespacedQueueName}.routing-key`;\n\n            await channel.assertExchange(exchangeName, 'direct', {});\n            const queue = await channel.assertQueue(namespacedQueueName, {});\n            await channel.bindQueue(queue.queue, exchangeName, routingKey);\n\n            this.connection = conn;\n            this.channel = channel;\n        })();\n\n        try {\n            await this.connectingPromise;\n        } finally {\n            this.connectingPromise = null;\n        }\n\n        if (!this.channel) {\n            throw new Error('Failed to initialize RabbitMQ channel');\n        }\n\n        return this.channel;\n    }\n\n    // Nest will call this for every subclass instance, because they inherit the method\n    async onModuleDestroy(): Promise<void> {\n        await this.closeConnectionAndChannel();\n    }\n\n    private async closeConnectionAndChannel(): Promise<void> {\n        if (this.channel) {\n            try {\n                await this.channel.close();\n            } catch (err) {\n                this.logger.warn(\n                    `RabbitMqPublisher error closing channel: ${(err as Error).message}`,\n                );\n            } finally {\n                this.channel = null;\n            }\n        }\n\n        if (this.connection) {\n            try {\n                await this.connection.close();\n            } catch (err) {\n                this.logger.warn(\n                    `RabbitMqPublisher error closing connection: ${(err as Error).message}`,\n                );\n            } finally {\n                this.connection = null;\n            }\n        }\n    }\n\n    async publish(message: QueueMessage<T>): Promise<string> {\n        if (!this.url) {\n            this.logger.error('RabbitMqPublisher url is not defined in the environment variables');\n            throw new Error('RabbitMqPublisher url is not defined in the environment variables');\n        }\n        if (!this.serviceRole) {\n            this.logger.error('Queue service Role is not defined in the environment variables');\n            throw new Error('Queue service Role is not defined in the environment variables');\n        }\n        if (this.serviceRole === 'subscriber') {\n            this.logger.error('Queue service Role is subscriber, cannot publish messages');\n            throw new Error('Queue service Role is subscriber, cannot publish messages');\n        }\n\n        const channel = await this.ensureConnectionAndChannel();\n        // this.logger.debug(`RabbitMqPublisher publisher channel created options: ${JSON.stringify(this.options())} and url: ${url}`);\n\n        const options = this.options();\n\n        const queueName = options.queueName;\n        const namespacedQueueName = buildNamespacedQueueName(queueName);\n\n        const exchangeName = `${namespacedQueueName}.exchange`;\n        const routingKey = `${namespacedQueueName}.routing-key`;\n\n        // Set default values for retry. \n        // by default there are no retries.\n        if (!message.retryCount) message.retryCount = 0;\n        if (!message.retryInterval) message.retryInterval = 1000;\n\n        // generate a new message id \n        message.messageId = uuidv4();\n\n        // Save the message to the DB so that we can then change its status in the subscriber...\n        if (this.shouldPersistToDatabase()) {\n            await this.persistToDatabase(namespacedQueueName, message);\n        }\n\n        // wait for the channel to confirm \n        try {\n            // Publish the message\n            // const publishStatus = channel.publish(exchangeName, routingKey, Buffer.from(JSON.stringify(message)));\n            const publishStatus = channel.publish(exchangeName, routingKey, Buffer.from(JSON.stringify(message)), { mandatory: true });\n            // this.logger.debug(`RabbitMqPublisher publish status: ${JSON.stringify(publishStatus)}`);\n            // if (!publishStatus) {\n            //     this.logger.warn('RabbitMqPublisher Message buffering failed!');\n            // }\n            // await channel.waitForConfirms();\n            // this.logger.debug('RabbitMqPublisher Message published successfully');\n        } catch (err) {\n            this.logger.error(`RabbitMqPublisher Message publish failed: ${JSON.stringify(err)}`);\n            if (err instanceof Error) {\n                this.logger.error(`RabbitMqPublisher Error stack: ${err.stack}`);\n            }\n        }\n        finally {\n        }\n        // this.logger.debug(`Sent message: ${JSON.stringify(message)}`);\n\n        // return the newly created message id.\n        return message.messageId;\n    }\n\n    private async persistToDatabase(queueName: string, message: QueueMessage<T>) {\n\n        // make an entry in the relevant database table, generate a unique id earlier.\n        try {\n            // 1. resolve the queue first\n            const mqMessageQueue = await this.mqMessageQueueService.resolveQueue(queueName);\n\n            // 2. Next create an entry in the mqMessage table. \n            await this.mqMessageService.create({\n                messageBroker: this.options().type,\n                messageId: message.messageId,\n                retryCount: message.retryCount,\n                retryInterval: message.retryInterval,\n                stage: 'pending',\n                startedAt: new Date(),\n                input: JSON.stringify(message, null, 2),\n                parentEntityId: message.parentEntityId,\n                parentEntity: message.parentEntity,\n                mqMessageQueueId: mqMessageQueue.id,\n            });\n        }\n        catch (error) {\n            this.logger.error(error.message, error.stack);\n        }\n\n    }\n}\n"]}

package/dist/services/queues/rabbitmq-subscriber.service.d.ts

@@ -21,6 +21,7 @@ export declare abstract class RabbitMqSubscriber<T> implements OnModuleInit, Que
     protected get logger(): Logger;
     abstract subscribe(message: QueueMessage<T>): any;
     abstract options(): QueuesModuleOptions;
+    protected shouldPersistToDatabase(): boolean;
     establishConnection(): Promise<amqp.Connection>;
     onModuleInit(): Promise<void>;
     private connectAndConsume;
@@ -31,7 +32,10 @@ export declare abstract class RabbitMqSubscriber<T> implements OnModuleInit, Que
     private cleanup;
     private sleep;
     private backoff;
-    protected processMessage(message: QueueMessage<T>, rawMessage: any, channel: any): Promise<void>;
+    protected processMessage(message: QueueMessage<T>, rawMessage: any, channel: any, queueName: string): Promise<void>;
     private updateStatusInDatabase;
+    private resolveProcessingTimeoutMs;
+    private parsePositiveInt;
+    private subscribeWithTimeout;
 }
 //# sourceMappingURL=rabbitmq-subscriber.service.d.ts.map

package/dist/services/queues/rabbitmq-subscriber.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rabbitmq-subscriber.service.d.ts","sourceRoot":"","sources":["../../../src/services/queues/rabbitmq-subscriber.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAIzD,8BAAsB,kBAAkB,CAAC,CAAC,CAAE,YAAW,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC;IAWvE,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IAAE,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IAVlI,OAAO,CAAC,eAAe,CAAC,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,UAAU,CAAgC;IAClD,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,gBAAgB,CAA8B;IACtD,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,QAAQ,CAAS;gBAEM,gBAAgB,EAAE,gBAAgB,EAAqB,qBAAqB,EAAE,qBAAqB;IAYlI,SAAS,KAAK,aAAa,IAAI,MAAM,CAEpC;IAED,SAAS,KAAK,MAAM,IAAI,MAAM,CAK7B;IAED,QAAQ,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;IAE3C,QAAQ,CAAC,OAAO,IAAI,mBAAmB;IAEjC,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC;IAsB/C,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;YAqCrB,iBAAiB;YA0GjB,qBAAqB;YA8BrB,oBAAoB;IAclC,OAAO,CAAC,gBAAgB;YAWV,aAAa;YAkBb,OAAO;IAkCrB,OAAO,CAAC,KAAK;IAKb,OAAO,CAAC,OAAO;cAWC,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,UAAU,KAAA,EAAE,OAAO,KAAA,GAAG,OAAO,CAAC,IAAI,CAAC;YAc9E,sBAAsB;CAkCvC"}
+{"version":3,"file":"rabbitmq-subscriber.service.d.ts","sourceRoot":"","sources":["../../../src/services/queues/rabbitmq-subscriber.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAezD,8BAAsB,kBAAkB,CAAC,CAAC,CAAE,YAAW,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC;IAWvE,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IAAE,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IAVlI,OAAO,CAAC,eAAe,CAAC,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,UAAU,CAAgC;IAClD,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,gBAAgB,CAA8B;IACtD,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,QAAQ,CAAS;gBAEM,gBAAgB,EAAE,gBAAgB,EAAqB,qBAAqB,EAAE,qBAAqB;IAYlI,SAAS,KAAK,aAAa,IAAI,MAAM,CAEpC;IAED,SAAS,KAAK,MAAM,IAAI,MAAM,CAK7B;IAED,QAAQ,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;IAE3C,QAAQ,CAAC,OAAO,IAAI,mBAAmB;IAEvC,SAAS,CAAC,uBAAuB,IAAI,OAAO;IAItC,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC;IAsB/C,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;YA2CrB,iBAAiB;YA8GjB,qBAAqB;YAiCrB,oBAAoB;IAclC,OAAO,CAAC,gBAAgB;YAWV,aAAa;YAkBb,OAAO;IAkCrB,OAAO,CAAC,KAAK;IAKb,OAAO,CAAC,OAAO;cAWC,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,UAAU,KAAA,EAAE,OAAO,KAAA,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAkBjG,sBAAsB;IAkCpC,OAAO,CAAC,0BAA0B;IAqBlC,OAAO,CAAC,gBAAgB;YASV,oBAAoB;CAuDrC"}

package/dist/services/queues/rabbitmq-subscriber.service.js

@@ -37,6 +37,15 @@ exports.RabbitMqSubscriber = void 0;
 const common_1 = require("@nestjs/common");
 const amqp = __importStar(require("amqplib"));
 const common_2 = require("./common");
+class ConsumerProcessingTimeoutError extends Error {
+    constructor(queueName, messageId, timeoutMs) {
+        super(`Subscriber processing timed out after ${timeoutMs}ms for queue ${queueName} and messageId ${messageId}`);
+        this.queueName = queueName;
+        this.messageId = messageId;
+        this.timeoutMs = timeoutMs;
+        this.name = 'ConsumerProcessingTimeoutError';
+    }
+}
 class RabbitMqSubscriber {
     constructor(mqMessageService, mqMessageQueueService) {
         this.mqMessageService = mqMessageService;
@@ -65,6 +74,9 @@ class RabbitMqSubscriber {
         }
         return this._loggerInstance;
     }
+    shouldPersistToDatabase() {
+        return this.options().persistToDatabase ?? true;
+    }
     async establishConnection() {
         const url = new URL(this.url);
         const connection = await amqp.connect({
@@ -82,7 +94,12 @@ class RabbitMqSubscriber {
         const defaultBroker = process.env.QUEUES_DEFAULT_BROKER || 'rabbitmq';
         const solidCliRunning = process.env.SOLID_CLI_RUNNING || "false";
         const queueNameRegex = (process.env.QUEUES_QUEUE_NAME_REGEX_TO_ENABLE || '').trim();
-        if (this.url && ['both', 'subscriber'].includes(this.serviceRole) && solidCliRunning === "false" && defaultBroker === 'rabbitmq') {
+        const roleAllowed = ['both', 'subscriber'].includes(this.serviceRole);
+        if (!roleAllowed) {
+            this.logger.log(`RabbitMqSubscriber is disabled because QUEUES_SERVICE_ROLE is "${this.serviceRole}". Expected "both" or "subscriber".`);
+            return;
+        }
+        if (this.url && solidCliRunning === "false" && defaultBroker === 'rabbitmq') {
             const options = this.options();
             const queueName = options.queueName;
             if (queueNameRegex && queueNameRegex !== "all") {
@@ -117,6 +134,10 @@ class RabbitMqSubscriber {
         if (prefetch < 1) {
             throw new Error(`RabbitMqSubscriber prefetch must be >= 1 for queue ${queueName}`);
         }
+        const processingTimeoutMs = this.resolveProcessingTimeoutMs();
+        if (processingTimeoutMs > 0) {
+            this.logger.log(`RabbitMqSubscriber using processing timeout ${processingTimeoutMs}ms for queue ${queueName}`);
+        }
         let connection;
         try {
             connection = await this.establishConnection();
@@ -188,7 +209,7 @@ class RabbitMqSubscriber {
             if (!message.currentRetry)
                 message.currentRetry = 0;
             try {
-                await this.processMessage(message, rawMessage, channel);
+                await this.processMessage(message, rawMessage, channel, queueName);
             }
             catch (error) {
                 await this.handleProcessingError(message, rawMessage, channel, error, queueName);
@@ -198,9 +219,11 @@ class RabbitMqSubscriber {
     }
     async handleProcessingError(message, rawMessage, channel, error, queueName) {
         const errorMessage = error?.message || String(error);
-        this.logger.error(`Error processing message on queue ${queueName}: ${errorMessage}`);
+        this.logger.error(`Error processing message on queue ${queueName}: ${errorMessage}`, error?.stack);
         if (message.currentRetry < message.retryCount) {
-            await this.updateStatusInDatabase('retrying', message);
+            if (this.shouldPersistToDatabase()) {
+                await this.updateStatusInDatabase('retrying', message);
+            }
             message.currentRetry++;
             const retryQueue = `${queueName}.retry`;
             const payload = Buffer.from(JSON.stringify(message));
@@ -214,7 +237,9 @@ class RabbitMqSubscriber {
             this.logger.warn(`Retrying message (${message.currentRetry}/${message.retryCount}) after ${message.retryInterval}ms on queue ${queueName}`);
             return;
         }
-        await this.updateStatusInDatabase('failed', message, errorMessage, '');
+        if (this.shouldPersistToDatabase()) {
+            await this.updateStatusInDatabase('failed', message, errorMessage, '');
+        }
         channel.ack(rawMessage);
         await this.publishToFailedQueue(queueName, Buffer.from(JSON.stringify(message)), channel, error);
         this.logger.error(`Message failed after ${message.retryCount} attempts on queue ${queueName}: ${errorMessage}`);
@@ -298,11 +323,15 @@ class RabbitMqSubscriber {
         const jitter = Math.floor(Math.random() * (exp * 0.2));
         return Math.min(maxMs, exp + jitter);
     }
-    async processMessage(message, rawMessage, channel) {
-        await this.updateStatusInDatabase('started', message);
-        const result = await this.subscribe(message);
+    async processMessage(message, rawMessage, channel, queueName) {
+        if (this.shouldPersistToDatabase()) {
+            await this.updateStatusInDatabase('started', message);
+        }
+        const result = await this.subscribeWithTimeout(message, queueName);
         channel.ack(rawMessage);
-        await this.updateStatusInDatabase('succeeded', message, '', result ? JSON.stringify(result, null, 2) : '');
+        if (this.shouldPersistToDatabase()) {
+            await this.updateStatusInDatabase('succeeded', message, '', result ? JSON.stringify(result, null, 2) : '');
+        }
     }
     async updateStatusInDatabase(stage, message, error = '', result = '') {
         try {
@@ -332,6 +361,52 @@ class RabbitMqSubscriber {
             this.logger.error(error.message, error.stack);
         }
     }
+    resolveProcessingTimeoutMs() {
+        const brokerTimeoutMs = this.parsePositiveInt(process.env.QUEUES_RABBITMQ_CONSUMER_ACK_TIMEOUT_MS, 30 * 60 * 1000);
+        const defaultSoftTimeoutMs = Math.max(1_000, brokerTimeoutMs - 30_000);
+        return this.parsePositiveInt(process.env.QUEUES_RABBITMQ_SUBSCRIBER_PROCESSING_TIMEOUT_MS, defaultSoftTimeoutMs);
+    }
+    parsePositiveInt(value, fallback) {
+        if (!value)
+            return fallback;
+        const parsed = Number.parseInt(value, 10);
+        return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
+    }
+    async subscribeWithTimeout(message, queueName) {
+        const timeoutMs = this.resolveProcessingTimeoutMs();
+        const messageId = message?.messageId || 'unknown';
+        if (timeoutMs <= 0) {
+            return this.subscribe(message);
+        }
+        let timedOut = false;
+        let timeoutHandle = null;
+        const subscribePromise = this.subscribe(message).catch((error) => {
+            if (timedOut) {
+                this.logger.error(`Subscriber promise rejected after timeout for queue ${queueName} and messageId ${messageId}: ${error?.message || String(error)}`, error?.stack);
+                return undefined;
+            }
+            throw error;
+        });
+        const timeoutPromise = new Promise((_, reject) => {
+            timeoutHandle = setTimeout(() => {
+                timedOut = true;
+                reject(new ConsumerProcessingTimeoutError(queueName, messageId, timeoutMs));
+            }, timeoutMs);
+        });
+        try {
+            return await Promise.race([subscribePromise, timeoutPromise]);
+        }
+        catch (error) {
+            const errorMessage = error?.message || String(error);
+            this.logger.error(`Subscriber execution failed for queue ${queueName} and messageId ${messageId}: ${errorMessage}`, error?.stack);
+            throw error;
+        }
+        finally {
+            if (timeoutHandle) {
+                clearTimeout(timeoutHandle);
+            }
+        }
+    }
 }
 exports.RabbitMqSubscriber = RabbitMqSubscriber;
 //# sourceMappingURL=rabbitmq-subscriber.service.js.map