@solidxai/core 0.1.7 → 0.1.8-beta.0

package/dist/seeders/seed-data/solid-core-metadata.json

@@ -7239,35 +7239,28 @@
                     {
                         "type": "field",
                         "attrs": {
-                            "name": "fieldName",
-                            "isSearchable": true
-                        }
-                    },
-                    {
-                        "type": "field",
-                        "attrs": {
-                            "name": "oldValueDisplay",
+                            "name": "fieldDisplayName",
                             "isSearchable": true
                         }
                     },
                     {
                         "type": "field",
                         "attrs": {
-                            "name": "newValueDisplay",
+                            "name": "fieldName",
                             "isSearchable": true
                         }
                     },
                     {
                         "type": "field",
                         "attrs": {
-                            "name": "oldValue",
+                            "name": "oldValueDisplay",
                             "isSearchable": true
                         }
                     },
                     {
                         "type": "field",
                         "attrs": {
-                            "name": "newValue",
+                            "name": "newValueDisplay",
                             "isSearchable": true
                         }
                     }
@@ -7309,36 +7302,43 @@
                                     {
                                         "type": "field",
                                         "attrs": {
-                                            "name": "fieldName",
-                                            "isSearchable": true
+                                            "name": "fieldDisplayName"
                                         }
                                     },
                                     {
                                         "type": "field",
                                         "attrs": {
-                                            "name": "oldValueDisplay",
-                                            "isSearchable": true
+                                            "name": "fieldName"
                                         }
                                     },
                                     {
                                         "type": "field",
                                         "attrs": {
-                                            "name": "newValueDisplay",
-                                            "isSearchable": true
+                                            "name": "oldValueDisplay"
                                         }
                                     },
                                     {
                                         "type": "field",
                                         "attrs": {
-                                            "name": "oldValue",
-                                            "isSearchable": true
+                                            "name": "newValueDisplay"
                                         }
                                     },
                                     {
                                         "type": "field",
                                         "attrs": {
-                                            "name": "newValue",
-                                            "isSearchable": true
+                                            "name": "oldValue"
+                                        }
+                                    },
+                                    {
+                                        "type": "field",
+                                        "attrs": {
+                                            "name": "newValue"
+                                        }
+                                    },
+                                    {
+                                        "type": "field",
+                                        "attrs": {
+                                            "name": "chatterMessage"
                                         }
                                     }
                                 ]
@@ -7387,16 +7387,22 @@
                     {
                         "type": "field",
                         "attrs": {
-                            "name": "coModelEntityId",
+                            "name": "modelDisplayName",
                             "isSearchable": true
                         }
                     },
                     {
                         "type": "field",
                         "attrs": {
-                            "name": "coModelName",
+                            "name": "coModelEntityId",
                             "isSearchable": true
                         }
+                    },
+                    {
+                        "type": "field",
+                        "attrs": {
+                            "name": "user"
+                        }
                     }
                 ]
             }
@@ -7436,29 +7442,49 @@
                                     {
                                         "type": "field",
                                         "attrs": {
-                                            "name": "messageType",
-                                            "isSearchable": true
+                                            "name": "messageType"
                                         }
                                     },
                                     {
                                         "type": "field",
                                         "attrs": {
-                                            "name": "messageSubType",
-                                            "isSearchable": true
+                                            "name": "messageSubType"
                                         }
                                     },
                                     {
                                         "type": "field",
                                         "attrs": {
-                                            "name": "coModelEntityId",
-                                            "isSearchable": true
+                                            "name": "modelDisplayName"
                                         }
                                     },
                                     {
                                         "type": "field",
                                         "attrs": {
-                                            "name": "coModelName",
-                                            "isSearchable": true
+                                            "name": "coModelEntityId"
+                                        }
+                                    },
+                                    {
+                                        "type": "field",
+                                        "attrs": {
+                                            "name": "modelUserKey"
+                                        }
+                                    },
+                                    {
+                                        "type": "field",
+                                        "attrs": {
+                                            "name": "user"
+                                        }
+                                    },
+                                    {
+                                        "type": "field",
+                                        "attrs": {
+                                            "name": "messageBody"
+                                        }
+                                    },
+                                    {
+                                        "type": "field",
+                                        "attrs": {
+                                            "name": "messageAttachments"
                                         }
                                     },
                                     {

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

@@ -1 +1,19 @@
+import { OnModuleDestroy } from '@nestjs/common';
+import { QueuesModuleOptions } from '../../interfaces';
+import { QueueMessage, QueuePublisher } from '../../interfaces/mq';
+import { MqMessageQueueService } from '../mq-message-queue.service';
+import { MqMessageService } from '../mq-message.service';
+export declare abstract class RedisPublisher<T> implements OnModuleDestroy, QueuePublisher<T> {
+    protected readonly mqMessageService: MqMessageService;
+    protected readonly mqMessageQueueService: MqMessageQueueService;
+    private readonly logger;
+    private readonly serviceRole;
+    private client;
+    constructor(mqMessageService: MqMessageService, mqMessageQueueService: MqMessageQueueService);
+    abstract options(): QueuesModuleOptions;
+    private getClient;
+    onModuleDestroy(): Promise<void>;
+    publish(message: QueueMessage<T>): Promise<string>;
+    private persistToDatabase;
+}
 //# sourceMappingURL=redis-publisher.service.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"redis-publisher.service.d.ts","sourceRoot":"","sources":["../../../src/services/queues/redis-publisher.service.ts"],"names":[],"mappings":""}
+{"version":3,"file":"redis-publisher.service.d.ts","sourceRoot":"","sources":["../../../src/services/queues/redis-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,cAAc,CAAC,CAAC,CAAE,YAAW,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC;IAM7E,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IACrD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IANnE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmC;IAC1D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,MAAM,CAAsB;gBAGb,gBAAgB,EAAE,gBAAgB,EAClC,qBAAqB,EAAE,qBAAqB;IAQnE,QAAQ,CAAC,OAAO,IAAI,mBAAmB;IAEvC,OAAO,CAAC,SAAS;IAUX,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAOhC,OAAO,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;YA+B1C,iBAAiB;CAmBlC"}

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

@@ -1 +1,87 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RedisPublisher = void 0;
+const common_1 = require("@nestjs/common");
+const ioredis_1 = __importDefault(require("ioredis"));
+const uuid_1 = require("uuid");
+const common_2 = require("./common");
+class RedisPublisher {
+    constructor(mqMessageService, mqMessageQueueService) {
+        this.mqMessageService = mqMessageService;
+        this.mqMessageQueueService = mqMessageQueueService;
+        this.logger = new common_1.Logger(RedisPublisher.name);
+        this.client = null;
+        this.serviceRole = process.env.QUEUES_SERVICE_ROLE;
+        if (!process.env.QUEUES_REDIS_URL) {
+            this.logger.debug('RedisPublisher: QUEUES_REDIS_URL is not defined in the environment variables');
+        }
+    }
+    getClient() {
+        if (!this.client) {
+            this.client = new ioredis_1.default(process.env.QUEUES_REDIS_URL);
+            this.client.on('error', (err) => {
+                this.logger.error(`RedisPublisher connection error: ${err.message}`, err.stack);
+            });
+        }
+        return this.client;
+    }
+    async onModuleDestroy() {
+        if (this.client) {
+            await this.client.quit();
+            this.client = null;
+        }
+    }
+    async publish(message) {
+        if (!process.env.QUEUES_REDIS_URL) {
+            throw new Error('RedisPublisher: QUEUES_REDIS_URL is not defined in the environment variables');
+        }
+        if (!this.serviceRole) {
+            throw new Error('RedisPublisher: Queue service Role is not defined in the environment variables');
+        }
+        if (this.serviceRole === 'subscriber') {
+            throw new Error('RedisPublisher: Queue service Role is subscriber, cannot publish messages');
+        }
+        if (!message.retryCount)
+            message.retryCount = 0;
+        if (!message.retryInterval)
+            message.retryInterval = 1000;
+        message.messageId = (0, uuid_1.v4)();
+        const queueName = this.options().queueName;
+        const namespacedQueueName = (0, common_2.buildNamespacedQueueName)(queueName);
+        await this.persistToDatabase(namespacedQueueName, message);
+        try {
+            const client = this.getClient();
+            await client.publish(namespacedQueueName, JSON.stringify(message));
+            this.logger.debug(`RedisPublisher published message ${message.messageId} to channel ${namespacedQueueName}`);
+        }
+        catch (err) {
+            this.logger.error(`RedisPublisher failed to publish message: ${err.message}`, err.stack);
+        }
+        return message.messageId;
+    }
+    async persistToDatabase(queueName, message) {
+        try {
+            const mqMessageQueue = await this.mqMessageQueueService.resolveQueue(queueName);
+            await this.mqMessageService.create({
+                messageBroker: this.options().type,
+                messageId: message.messageId,
+                retryCount: message.retryCount,
+                retryInterval: message.retryInterval,
+                stage: 'pending',
+                startedAt: new Date(),
+                input: JSON.stringify(message, null, 2),
+                parentEntityId: message.parentEntityId,
+                parentEntity: message.parentEntity,
+                mqMessageQueueId: mqMessageQueue.id,
+            });
+        }
+        catch (error) {
+            this.logger.error(error.message, error.stack);
+        }
+    }
+}
+exports.RedisPublisher = RedisPublisher;
 //# sourceMappingURL=redis-publisher.service.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"redis-publisher.service.js","sourceRoot":"","sources":["../../../src/services/queues/redis-publisher.service.ts"],"names":[],"mappings":"","sourcesContent":[""]}
+{"version":3,"file":"redis-publisher.service.js","sourceRoot":"","sources":["../../../src/services/queues/redis-publisher.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Logger, OnModuleDestroy } from '@nestjs/common';\nimport Redis from 'ioredis';\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 RedisPublisher<T> implements OnModuleDestroy, QueuePublisher<T> {\n    private readonly logger = new Logger(RedisPublisher.name);\n    private readonly serviceRole: string;\n    private client: Redis | null = null;\n\n    constructor(\n        protected readonly mqMessageService: MqMessageService,\n        protected readonly mqMessageQueueService: MqMessageQueueService,\n    ) {\n        this.serviceRole = process.env.QUEUES_SERVICE_ROLE;\n        if (!process.env.QUEUES_REDIS_URL) {\n            this.logger.debug('RedisPublisher: QUEUES_REDIS_URL is not defined in the environment variables');\n        }\n    }\n\n    abstract options(): QueuesModuleOptions;\n\n    private getClient(): Redis {\n        if (!this.client) {\n            this.client = new Redis(process.env.QUEUES_REDIS_URL);\n            this.client.on('error', (err) => {\n                this.logger.error(`RedisPublisher connection error: ${err.message}`, err.stack);\n            });\n        }\n        return this.client;\n    }\n\n    async onModuleDestroy(): Promise<void> {\n        if (this.client) {\n            await this.client.quit();\n            this.client = null;\n        }\n    }\n\n    async publish(message: QueueMessage<T>): Promise<string> {\n        if (!process.env.QUEUES_REDIS_URL) {\n            throw new Error('RedisPublisher: QUEUES_REDIS_URL is not defined in the environment variables');\n        }\n        if (!this.serviceRole) {\n            throw new Error('RedisPublisher: Queue service Role is not defined in the environment variables');\n        }\n        if (this.serviceRole === 'subscriber') {\n            throw new Error('RedisPublisher: Queue service Role is subscriber, cannot publish messages');\n        }\n\n        if (!message.retryCount) message.retryCount = 0;\n        if (!message.retryInterval) message.retryInterval = 1000;\n        message.messageId = uuidv4();\n\n        const queueName = this.options().queueName;\n        const namespacedQueueName = buildNamespacedQueueName(queueName);\n\n        await this.persistToDatabase(namespacedQueueName, message);\n\n        try {\n            const client = this.getClient();\n            await client.publish(namespacedQueueName, JSON.stringify(message));\n            this.logger.debug(`RedisPublisher published message ${message.messageId} to channel ${namespacedQueueName}`);\n        } catch (err) {\n            this.logger.error(`RedisPublisher failed to publish message: ${(err as Error).message}`, (err as Error).stack);\n        }\n\n        return message.messageId;\n    }\n\n    private async persistToDatabase(queueName: string, message: QueueMessage<T>): Promise<void> {\n        try {\n            const mqMessageQueue = await this.mqMessageQueueService.resolveQueue(queueName);\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        } catch (error) {\n            this.logger.error(error.message, error.stack);\n        }\n    }\n}"]}

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

@@ -1 +1,27 @@
+import { OnModuleDestroy, OnModuleInit } from '@nestjs/common';
+import { QueuesModuleOptions } from '../../interfaces';
+import { QueueMessage, QueueSubscriber } from '../../interfaces/mq';
+import { MqMessageQueueService } from '../mq-message-queue.service';
+import { MqMessageService } from '../mq-message.service';
+export declare abstract class RedisSubscriber<T> implements OnModuleInit, OnModuleDestroy, QueueSubscriber<T> {
+    protected readonly mqMessageService: MqMessageService;
+    protected readonly mqMessageQueueService: MqMessageQueueService;
+    private readonly logger;
+    private readonly serviceRole;
+    private client;
+    private reconnectAttempt;
+    private stopping;
+    constructor(mqMessageService: MqMessageService, mqMessageQueueService: MqMessageQueueService);
+    abstract subscribe(message: QueueMessage<T>): void;
+    abstract options(): QueuesModuleOptions;
+    onModuleInit(): Promise<void>;
+    onModuleDestroy(): Promise<void>;
+    private connectAndSubscribe;
+    private handleProcessingError;
+    private triggerReconnect;
+    private cleanup;
+    private backoff;
+    protected processMessage(message: QueueMessage<T>): Promise<void>;
+    private updateStatusInDatabase;
+}
 //# sourceMappingURL=redis-subscriber.service.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"redis-subscriber.service.d.ts","sourceRoot":"","sources":["../../../src/services/queues/redis-subscriber.service.ts"],"names":[],"mappings":""}
+{"version":3,"file":"redis-subscriber.service.d.ts","sourceRoot":"","sources":["../../../src/services/queues/redis-subscriber.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,eAAe,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEvE,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;AAGzD,8BAAsB,eAAe,CAAC,CAAC,CAAE,YAAW,YAAY,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC;IAQ7F,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IACrD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IARnE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;IAC3D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,QAAQ,CAAS;gBAGF,gBAAgB,EAAE,gBAAgB,EAClC,qBAAqB,EAAE,qBAAqB;IAQnE,QAAQ,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI;IAElD,QAAQ,CAAC,OAAO,IAAI,mBAAmB;IAEjC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAqC7B,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;YAKxB,mBAAmB;YA2CnB,qBAAqB;IAuBnC,OAAO,CAAC,gBAAgB;YAkBV,OAAO;IAarB,OAAO,CAAC,OAAO;cAQC,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;YAMzD,sBAAsB;CAyBvC"}

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

@@ -1 +1,183 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RedisSubscriber = void 0;
+const common_1 = require("@nestjs/common");
+const ioredis_1 = __importDefault(require("ioredis"));
+const common_2 = require("./common");
+class RedisSubscriber {
+    constructor(mqMessageService, mqMessageQueueService) {
+        this.mqMessageService = mqMessageService;
+        this.mqMessageQueueService = mqMessageQueueService;
+        this.logger = new common_1.Logger(RedisSubscriber.name);
+        this.client = null;
+        this.reconnectAttempt = 0;
+        this.stopping = false;
+        this.serviceRole = process.env.QUEUES_SERVICE_ROLE;
+        if (!process.env.QUEUES_REDIS_URL) {
+            this.logger.debug('RedisSubscriber: QUEUES_REDIS_URL is not defined in the environment variables');
+        }
+    }
+    async onModuleInit() {
+        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 (process.env.QUEUES_REDIS_URL &&
+            ['both', 'subscriber'].includes(this.serviceRole) &&
+            solidCliRunning === 'false' &&
+            defaultBroker === 'redis') {
+            const options = this.options();
+            const queueName = options.queueName;
+            if (queueNameRegex && queueNameRegex !== 'all') {
+                try {
+                    const regex = new RegExp(queueNameRegex);
+                    if (!regex.test(queueName)) {
+                        this.logger.log(`RedisSubscriber for queue ${queueName} is disabled because it does not match QUEUES_QUEUE_NAME_REGEX_TO_ENABLE=${queueNameRegex}`);
+                        return;
+                    }
+                }
+                catch (error) {
+                    this.logger.error(`Invalid QUEUES_QUEUE_NAME_REGEX_TO_ENABLE regex "${queueNameRegex}". Subscriber for queue ${queueName} will not start.`);
+                    return;
+                }
+            }
+            const namespacedQueueName = (0, common_2.buildNamespacedQueueName)(queueName);
+            await this.connectAndSubscribe(namespacedQueueName);
+            this.logger.log(`RedisSubscriber ready to consume messages: ${JSON.stringify(options)}`);
+        }
+    }
+    async onModuleDestroy() {
+        this.stopping = true;
+        await this.cleanup();
+    }
+    async connectAndSubscribe(channel) {
+        await this.cleanup();
+        const client = new ioredis_1.default(process.env.QUEUES_REDIS_URL);
+        this.client = client;
+        client.on('error', (err) => {
+            if (client !== this.client)
+                return;
+            this.logger.error(`RedisSubscriber connection error for channel ${channel}: ${err.message}`, err.stack);
+        });
+        client.on('close', () => {
+            if (client !== this.client)
+                return;
+            this.logger.warn(`RedisSubscriber connection closed for channel ${channel}`);
+            this.triggerReconnect(channel, 'connection closed');
+        });
+        client.on('message', async (receivedChannel, rawMessage) => {
+            if (receivedChannel !== channel)
+                return;
+            let message = null;
+            try {
+                message = JSON.parse(rawMessage);
+            }
+            catch (error) {
+                this.logger.error(`RedisSubscriber invalid JSON on channel ${channel}: ${error.message}`);
+                return;
+            }
+            if (!message.retryCount)
+                message.retryCount = 0;
+            if (!message.retryInterval)
+                message.retryInterval = 1000;
+            if (!message.currentRetry)
+                message.currentRetry = 0;
+            try {
+                await this.processMessage(message);
+            }
+            catch (error) {
+                await this.handleProcessingError(message, error, channel);
+            }
+        });
+        await client.subscribe(channel);
+        this.reconnectAttempt = 0;
+    }
+    async handleProcessingError(message, error, channel) {
+        const errorMessage = error?.message || String(error);
+        this.logger.error(`Error processing message on channel ${channel}: ${errorMessage}`);
+        if (message.currentRetry < message.retryCount) {
+            await this.updateStatusInDatabase('retrying', message);
+            message.currentRetry++;
+            this.logger.warn(`Retrying message (${message.currentRetry}/${message.retryCount}) after ${message.retryInterval}ms on channel ${channel}`);
+            setTimeout(async () => {
+                try {
+                    await this.processMessage(message);
+                }
+                catch (retryError) {
+                    await this.handleProcessingError(message, retryError, channel);
+                }
+            }, message.retryInterval);
+        }
+        else {
+            await this.updateStatusInDatabase('failed', message, errorMessage, '');
+            this.logger.error(`Message failed after ${message.retryCount} attempts on channel ${channel}: ${errorMessage}`);
+        }
+    }
+    triggerReconnect(channel, reason) {
+        if (this.stopping)
+            return;
+        this.reconnectAttempt++;
+        const delay = this.backoff();
+        this.logger.warn(`RedisSubscriber reconnecting for channel ${channel} (${reason}) in ${delay}ms`);
+        setTimeout(async () => {
+            if (this.stopping)
+                return;
+            try {
+                await this.connectAndSubscribe(channel);
+                this.logger.log(`RedisSubscriber reconnected for channel ${channel}`);
+            }
+            catch (err) {
+                this.triggerReconnect(channel, `reconnect failed: ${err.message}`);
+            }
+        }, delay);
+    }
+    async cleanup() {
+        const client = this.client;
+        this.client = null;
+        if (client) {
+            try {
+                await client.quit();
+            }
+            catch (_) {
+            }
+        }
+    }
+    backoff() {
+        const baseMs = 1000;
+        const maxMs = 30_000;
+        const exp = Math.min(maxMs, baseMs * Math.pow(2, this.reconnectAttempt));
+        const jitter = Math.floor(Math.random() * (exp * 0.2));
+        return Math.min(maxMs, exp + jitter);
+    }
+    async processMessage(message) {
+        await this.updateStatusInDatabase('started', message);
+        const result = await this.subscribe(message);
+        await this.updateStatusInDatabase('succeeded', message, '', result != null ? JSON.stringify(result, null, 2) : '');
+    }
+    async updateStatusInDatabase(stage, message, error = '', result = '') {
+        try {
+            const mqMessage = await this.mqMessageService.repo.findOne({
+                where: { messageId: message.messageId },
+            });
+            if (mqMessage) {
+                const updatedFields = { stage };
+                if (stage === 'failed' || stage === 'succeeded') {
+                    updatedFields['finishedAt'] = new Date();
+                    updatedFields['elapsedMillis'] = updatedFields['finishedAt'].getTime() - mqMessage.startedAt.getTime();
+                }
+                if (stage === 'succeeded')
+                    updatedFields['output'] = result;
+                if (stage === 'failed')
+                    updatedFields['error'] = error;
+                await this.mqMessageService.repo.update(mqMessage.id, updatedFields);
+            }
+        }
+        catch (err) {
+            this.logger.error(err.message, err.stack);
+        }
+    }
+}
+exports.RedisSubscriber = RedisSubscriber;
 //# sourceMappingURL=redis-subscriber.service.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"redis-subscriber.service.js","sourceRoot":"","sources":["../../../src/services/queues/redis-subscriber.service.ts"],"names":[],"mappings":"","sourcesContent":[""]}
+{"version":3,"file":"redis-subscriber.service.js","sourceRoot":"","sources":["../../../src/services/queues/redis-subscriber.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Logger, OnModuleDestroy, OnModuleInit } from '@nestjs/common';\nimport Redis from 'ioredis';\nimport { QueuesModuleOptions } from '../../interfaces';\nimport { QueueMessage, QueueSubscriber } from '../../interfaces/mq';\nimport { MqMessageQueueService } from '../mq-message-queue.service';\nimport { MqMessageService } from '../mq-message.service';\nimport { buildNamespacedQueueName } from './common';\n\nexport abstract class RedisSubscriber<T> implements OnModuleInit, OnModuleDestroy, QueueSubscriber<T> {\n    private readonly logger = new Logger(RedisSubscriber.name);\n    private readonly serviceRole: string;\n    private client: Redis | null = null;\n    private reconnectAttempt = 0;\n    private stopping = false;\n\n    constructor(\n        protected readonly mqMessageService: MqMessageService,\n        protected readonly mqMessageQueueService: MqMessageQueueService,\n    ) {\n        this.serviceRole = process.env.QUEUES_SERVICE_ROLE;\n        if (!process.env.QUEUES_REDIS_URL) {\n            this.logger.debug('RedisSubscriber: QUEUES_REDIS_URL is not defined in the environment variables');\n        }\n    }\n\n    abstract subscribe(message: QueueMessage<T>): void;\n\n    abstract options(): QueuesModuleOptions;\n\n    async onModuleInit(): Promise<void> {\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        if (\n            process.env.QUEUES_REDIS_URL &&\n            ['both', 'subscriber'].includes(this.serviceRole) &&\n            solidCliRunning === 'false' &&\n            defaultBroker === 'redis'\n        ) {\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(\n                            `RedisSubscriber for queue ${queueName} is disabled because it does not match QUEUES_QUEUE_NAME_REGEX_TO_ENABLE=${queueNameRegex}`,\n                        );\n                        return;\n                    }\n                } catch (error) {\n                    this.logger.error(\n                        `Invalid QUEUES_QUEUE_NAME_REGEX_TO_ENABLE regex \"${queueNameRegex}\". Subscriber for queue ${queueName} will not start.`,\n                    );\n                    return;\n                }\n            }\n\n            const namespacedQueueName = buildNamespacedQueueName(queueName);\n            await this.connectAndSubscribe(namespacedQueueName);\n            this.logger.log(`RedisSubscriber ready to consume messages: ${JSON.stringify(options)}`);\n        }\n    }\n\n    async onModuleDestroy(): Promise<void> {\n        this.stopping = true;\n        await this.cleanup();\n    }\n\n    private async connectAndSubscribe(channel: string): Promise<void> {\n        await this.cleanup();\n\n        const client = new Redis(process.env.QUEUES_REDIS_URL);\n        this.client = client;\n\n        client.on('error', (err) => {\n            if (client !== this.client) return;\n            this.logger.error(`RedisSubscriber connection error for channel ${channel}: ${err.message}`, err.stack);\n        });\n\n        client.on('close', () => {\n            if (client !== this.client) return;\n            this.logger.warn(`RedisSubscriber connection closed for channel ${channel}`);\n            this.triggerReconnect(channel, 'connection closed');\n        });\n\n        client.on('message', async (receivedChannel, rawMessage) => {\n            if (receivedChannel !== channel) return;\n\n            let message: QueueMessage<T> = null;\n            try {\n                message = JSON.parse(rawMessage) as QueueMessage<T>;\n            } catch (error) {\n                this.logger.error(`RedisSubscriber invalid JSON on channel ${channel}: ${(error as Error).message}`);\n                return;\n            }\n\n            if (!message.retryCount) message.retryCount = 0;\n            if (!message.retryInterval) message.retryInterval = 1000;\n            if (!message.currentRetry) message.currentRetry = 0;\n\n            try {\n                await this.processMessage(message);\n            } catch (error) {\n                await this.handleProcessingError(message, error, channel);\n            }\n        });\n\n        await client.subscribe(channel);\n        this.reconnectAttempt = 0;\n    }\n\n    private async handleProcessingError(message: QueueMessage<T>, error: any, channel: string): Promise<void> {\n        const errorMessage = (error as Error)?.message || String(error);\n        this.logger.error(`Error processing message on channel ${channel}: ${errorMessage}`);\n\n        if (message.currentRetry < message.retryCount) {\n            await this.updateStatusInDatabase('retrying', message);\n            message.currentRetry++;\n            this.logger.warn(\n                `Retrying message (${message.currentRetry}/${message.retryCount}) after ${message.retryInterval}ms on channel ${channel}`,\n            );\n            setTimeout(async () => {\n                try {\n                    await this.processMessage(message);\n                } catch (retryError) {\n                    await this.handleProcessingError(message, retryError, channel);\n                }\n            }, message.retryInterval);\n        } else {\n            await this.updateStatusInDatabase('failed', message, errorMessage, '');\n            this.logger.error(`Message failed after ${message.retryCount} attempts on channel ${channel}: ${errorMessage}`);\n        }\n    }\n\n    private triggerReconnect(channel: string, reason: string): void {\n        if (this.stopping) return;\n\n        this.reconnectAttempt++;\n        const delay = this.backoff();\n        this.logger.warn(`RedisSubscriber reconnecting for channel ${channel} (${reason}) in ${delay}ms`);\n\n        setTimeout(async () => {\n            if (this.stopping) return;\n            try {\n                await this.connectAndSubscribe(channel);\n                this.logger.log(`RedisSubscriber reconnected for channel ${channel}`);\n            } catch (err) {\n                this.triggerReconnect(channel, `reconnect failed: ${(err as Error).message}`);\n            }\n        }, delay);\n    }\n\n    private async cleanup(): Promise<void> {\n        const client = this.client;\n        this.client = null;\n\n        if (client) {\n            try {\n                await client.quit();\n            } catch (_) {\n                // ignore\n            }\n        }\n    }\n\n    private backoff(): number {\n        const baseMs = 1000;\n        const maxMs = 30_000;\n        const exp = Math.min(maxMs, baseMs * Math.pow(2, this.reconnectAttempt));\n        const jitter = Math.floor(Math.random() * (exp * 0.2));\n        return Math.min(maxMs, exp + jitter);\n    }\n\n    protected async processMessage(message: QueueMessage<T>): Promise<void> {\n        await this.updateStatusInDatabase('started', message);\n        const result: any = await (this.subscribe(message) as any);\n        await this.updateStatusInDatabase('succeeded', message, '', result != null ? JSON.stringify(result, null, 2) : '');\n    }\n\n    private async updateStatusInDatabase(\n        stage: string,\n        message: QueueMessage<T>,\n        error: string = '',\n        result: string = '',\n    ): Promise<void> {\n        try {\n            const mqMessage = await this.mqMessageService.repo.findOne({\n                where: { messageId: message.messageId },\n            });\n\n            if (mqMessage) {\n                const updatedFields: Record<string, any> = { stage };\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') updatedFields['output'] = result;\n                if (stage === 'failed') updatedFields['error'] = error;\n                await this.mqMessageService.repo.update(mqMessage.id, updatedFields);\n            }\n        } catch (err) {\n            this.logger.error(err.message, err.stack);\n        }\n    }\n}"]}

package/dist/solid-core.module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solid-core.module.d.ts","sourceRoot":"","sources":["../src/solid-core.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,kBAAkB,EAAU,UAAU,EAAE,MAAM,gBAAgB,CAAC;AA0VhF,qBAoca,eAAgB,YAAW,UAAU;IAChD,SAAS,CAAC,QAAQ,EAAE,kBAAkB;CAKvC"}
+{"version":3,"file":"solid-core.module.d.ts","sourceRoot":"","sources":["../src/solid-core.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,kBAAkB,EAAU,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAkXhF,qBA4da,eAAgB,YAAW,UAAU;IAChD,SAAS,CAAC,QAAQ,EAAE,kBAAkB;CAKvC"}