@solidxai/core 0.1.6 → 0.1.8-beta.0

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/services/request-context.service.d.ts

@@ -1,9 +1,10 @@
 import { ClsService } from "nestjs-cls";
 import { BasicFilterDto } from "src/dtos/basic-filters.dto";
+import { ActiveUserData } from "src/interfaces/active-user-data.interface";
 export declare class RequestContextService {
     private readonly cls;
     constructor(cls: ClsService);
-    getActiveUser(): any;
+    getActiveUser(): ActiveUserData | undefined;
     getIp(): string | undefined;
     getUserAgent(): string | undefined;
     setRequestFilter(filter: BasicFilterDto): void;

package/dist/services/request-context.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request-context.service.d.ts","sourceRoot":"","sources":["../../src/services/request-context.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,qBACa,qBAAqB;IAClB,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAAH,GAAG,EAAE,UAAU;IAI5C,aAAa;IAIb,KAAK,IAAI,MAAM,GAAG,SAAS;IAI3B,YAAY,IAAI,MAAM,GAAG,SAAS;IAIlC,gBAAgB,CAAC,MAAM,EAAE,cAAc;IAIvC,gBAAgB,IAAI,cAAc,GAAG,SAAS;CAIjD"}
+{"version":3,"file":"request-context.service.d.ts","sourceRoot":"","sources":["../../src/services/request-context.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAE3E,qBACa,qBAAqB;IAClB,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAAH,GAAG,EAAE,UAAU;IAI5C,aAAa,IAAI,cAAc,GAAG,SAAS;IAI3C,KAAK,IAAI,MAAM,GAAG,SAAS;IAI3B,YAAY,IAAI,MAAM,GAAG,SAAS;IAIlC,gBAAgB,CAAC,MAAM,EAAE,cAAc;IAIvC,gBAAgB,IAAI,cAAc,GAAG,SAAS;CAIjD"}

package/dist/services/request-context.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"request-context.service.js","sourceRoot":"","sources":["../../src/services/request-context.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2CAAwC;AACxC,4CAAiD;AAI1C,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAC9B,YAA6B,GAAe;QAAf,QAAG,GAAH,GAAG,CAAY;IAC5C,CAAC;IAGD,aAAa;QACT,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,4BAAgB,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACrC,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACrC,CAAC;IAED,gBAAgB,CAAC,MAAsB;QACnC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACnC,CAAC;IAED,gBAAgB;QACZ,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;CAEJ,CAAA;AAzBY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;qCAEyB,uBAAU;GADnC,qBAAqB,CAyBjC","sourcesContent":["import { Injectable } from \"@nestjs/common\";\nimport { ClsService } from \"nestjs-cls\";\nimport { REQUEST_USER_KEY } from \"src/constants\";\nimport { BasicFilterDto } from \"src/dtos/basic-filters.dto\";\n\n@Injectable()\nexport class RequestContextService {\n    constructor(private readonly cls: ClsService) {\n    }\n\n    // This method i.e getActiveUser() will fetch the user from the request object in the context\n    getActiveUser() {\n        return this.cls.get(REQUEST_USER_KEY);\n    }\n\n    getIp(): string | undefined {\n        return this.cls.get('ipAddress');\n    }\n\n    getUserAgent(): string | undefined {\n        return this.cls.get('userAgent');\n    }\n\n    setRequestFilter(filter: BasicFilterDto) {\n        this.cls.set('filter', filter);\n    }\n\n    getRequestFilter(): BasicFilterDto | undefined {\n        return this.cls.get('filter');\n    }\n\n}"]}
+{"version":3,"file":"request-context.service.js","sourceRoot":"","sources":["../../src/services/request-context.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2CAAwC;AACxC,4CAAiD;AAK1C,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAC9B,YAA6B,GAAe;QAAf,QAAG,GAAH,GAAG,CAAY;IAC5C,CAAC;IAGD,aAAa;QACT,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,4BAAgB,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACrC,CAAC;IAED,YAAY;QACR,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACrC,CAAC;IAED,gBAAgB,CAAC,MAAsB;QACnC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACnC,CAAC;IAED,gBAAgB;QACZ,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;CAEJ,CAAA;AAzBY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;qCAEyB,uBAAU;GADnC,qBAAqB,CAyBjC","sourcesContent":["import { Injectable } from \"@nestjs/common\";\nimport { ClsService } from \"nestjs-cls\";\nimport { REQUEST_USER_KEY } from \"src/constants\";\nimport { BasicFilterDto } from \"src/dtos/basic-filters.dto\";\nimport { ActiveUserData } from \"src/interfaces/active-user-data.interface\";\n\n@Injectable()\nexport class RequestContextService {\n    constructor(private readonly cls: ClsService) {\n    }\n\n    // This method i.e getActiveUser() will fetch the user from the request object in the context\n    getActiveUser(): ActiveUserData | undefined {\n        return this.cls.get(REQUEST_USER_KEY);\n    }\n\n    getIp(): string | undefined {\n        return this.cls.get('ipAddress');\n    }\n\n    getUserAgent(): string | undefined {\n        return this.cls.get('userAgent');\n    }\n\n    setRequestFilter(filter: BasicFilterDto) {\n        this.cls.set('filter', filter);\n    }\n\n    getRequestFilter(): BasicFilterDto | undefined {\n        return this.cls.get('filter');\n    }\n\n}"]}

package/dist/services/scheduled-job.service.d.ts

@@ -1,13 +1,18 @@
 import { ModuleRef } from "@nestjs/core";
 import { ScheduledJob } from 'src/entities/scheduled-job.entity';
+import { SolidRegistry } from 'src/helpers/solid-registry';
 import { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';
 import { EntityManager } from 'typeorm';
 import { CRUDService } from './crud.service';
+import { SchedulerServiceImpl } from './scheduled-jobs/scheduler.service';
 export declare class ScheduledJobService extends CRUDService<ScheduledJob> {
     readonly entityManager: EntityManager;
     readonly repo: ScheduledJobRepository;
     readonly moduleRef: ModuleRef;
+    private readonly solidRegistry;
+    private readonly schedulerService;
     private readonly logger;
-    constructor(entityManager: EntityManager, repo: ScheduledJobRepository, moduleRef: ModuleRef);
+    constructor(entityManager: EntityManager, repo: ScheduledJobRepository, moduleRef: ModuleRef, solidRegistry: SolidRegistry, schedulerService: SchedulerServiceImpl);
+    triggerRun(id: number): Promise<ScheduledJob>;
 }
 //# sourceMappingURL=scheduled-job.service.d.ts.map

package/dist/services/scheduled-job.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduled-job.service.d.ts","sourceRoot":"","sources":["../../src/services/scheduled-job.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBACa,mBAAoB,SAAQ,WAAW,CAAC,YAAY,CAAC;IAK9D,QAAQ,CAAC,aAAa,EAAE,aAAa;IAGrC,QAAQ,CAAC,IAAI,EAAE,sBAAsB;IACrC,QAAQ,CAAC,SAAS,EAAE,SAAS;IAR/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;gBAIpD,aAAa,EAAE,aAAa,EAG5B,IAAI,EAAE,sBAAsB,EAC5B,SAAS,EAAE,SAAS;CAKhC"}
+{"version":3,"file":"scheduled-job.service.d.ts","sourceRoot":"","sources":["../../src/services/scheduled-job.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAE1E,qBACa,mBAAoB,SAAQ,WAAW,CAAC,YAAY,CAAC;IAK9D,QAAQ,CAAC,aAAa,EAAE,aAAa;IAGrC,QAAQ,CAAC,IAAI,EAAE,sBAAsB;IACrC,QAAQ,CAAC,SAAS,EAAE,SAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAVnC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;gBAIpD,aAAa,EAAE,aAAa,EAG5B,IAAI,EAAE,sBAAsB,EAC5B,SAAS,EAAE,SAAS,EACZ,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,oBAAoB;IAMnD,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;CAwBpD"}

package/dist/services/scheduled-job.service.js

@@ -17,17 +17,39 @@ exports.ScheduledJobService = void 0;
 const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
 const typeorm_1 = require("@nestjs/typeorm");
+const solid_registry_1 = require("../helpers/solid-registry");
 const scheduled_job_repository_1 = require("../repository/scheduled-job.repository");
 const typeorm_2 = require("typeorm");
 const crud_service_1 = require("./crud.service");
+const scheduler_service_1 = require("./scheduled-jobs/scheduler.service");
 let ScheduledJobService = ScheduledJobService_1 = class ScheduledJobService extends crud_service_1.CRUDService {
-    constructor(entityManager, repo, moduleRef) {
+    constructor(entityManager, repo, moduleRef, solidRegistry, schedulerService) {
         super(entityManager, repo, 'scheduledJob', 'solid-core', moduleRef);
         this.entityManager = entityManager;
         this.repo = repo;
         this.moduleRef = moduleRef;
+        this.solidRegistry = solidRegistry;
+        this.schedulerService = schedulerService;
         this.logger = new common_1.Logger(ScheduledJobService_1.name);
     }
+    async triggerRun(id) {
+        const job = await this.repo.findOne({ where: { id } });
+        if (!job) {
+            throw new common_1.NotFoundException(`Scheduled job with id ${id} not found`);
+        }
+        const handler = this.solidRegistry.getScheduledJobProviderInstance(job.job);
+        if (!handler) {
+            throw new common_1.BadRequestException(`Scheduled job handler not found: ${job.job}`);
+        }
+        this.logger.log(`Manually triggering scheduled job id=${job.id}, job=${job.job}`);
+        await handler.execute(job);
+        const finishedAt = new Date();
+        job.lastRunAt = finishedAt;
+        job.nextRunAt = this.schedulerService.computeNextRunAt(job, finishedAt);
+        await this.repo.save(job);
+        this.logger.log(`Completed manual trigger for scheduled job id=${job.id}, nextRunAt=${job.nextRunAt?.toISOString?.()}`);
+        return job;
+    }
 };
 exports.ScheduledJobService = ScheduledJobService;
 exports.ScheduledJobService = ScheduledJobService = ScheduledJobService_1 = __decorate([
@@ -35,6 +57,8 @@ exports.ScheduledJobService = ScheduledJobService = ScheduledJobService_1 = __de
     __param(0, (0, typeorm_1.InjectEntityManager)()),
     __metadata("design:paramtypes", [typeorm_2.EntityManager,
         scheduled_job_repository_1.ScheduledJobRepository,
-        core_1.ModuleRef])
+        core_1.ModuleRef,
+        solid_registry_1.SolidRegistry,
+        scheduler_service_1.SchedulerServiceImpl])
 ], ScheduledJobService);
 //# sourceMappingURL=scheduled-job.service.js.map

package/dist/services/scheduled-job.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"scheduled-job.service.js","sourceRoot":"","sources":["../../src/services/scheduled-job.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,uCAAyC;AACzC,6CAAsD;AAEtD,qFAAiF;AACjF,qCAAwC;AACxC,iDAA6C;AAGtC,IAAM,mBAAmB,2BAAzB,MAAM,mBAAoB,SAAQ,0BAAyB;IAGhE,YAEE,aAAqC,EAG5B,IAA4B,EAC5B,SAAoB;QAG7B,KAAK,CAAC,aAAa,EAAE,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;QAP3D,kBAAa,GAAb,aAAa,CAAe;QAG5B,SAAI,GAAJ,IAAI,CAAwB;QAC5B,cAAS,GAAT,SAAS,CAAW;QARd,WAAM,GAAG,IAAI,eAAM,CAAC,qBAAmB,CAAC,IAAI,CAAC,CAAC;IAY/D,CAAC;CACF,CAAA;AAdY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;IAKR,WAAA,IAAA,6BAAmB,GAAE,CAAA;qCACE,uBAAa;QAGtB,iDAAsB;QACjB,gBAAS;GATpB,mBAAmB,CAc/B","sourcesContent":["import { Injectable, Logger } from '@nestjs/common';\nimport { ModuleRef } from \"@nestjs/core\";\nimport { InjectEntityManager } from '@nestjs/typeorm';\nimport { ScheduledJob } from 'src/entities/scheduled-job.entity';\nimport { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';\nimport { EntityManager } from 'typeorm';\nimport { CRUDService } from './crud.service';\n\n@Injectable()\nexport class ScheduledJobService extends CRUDService<ScheduledJob> {\n  private readonly logger = new Logger(ScheduledJobService.name);\n\n  constructor(\n    @InjectEntityManager()\n    readonly entityManager: EntityManager,\n    // @InjectRepository(ScheduledJob)\n    // readonly repo: Repository<ScheduledJob>,\n    readonly repo: ScheduledJobRepository,\n    readonly moduleRef: ModuleRef\n\n  ) {\n    super(entityManager, repo, 'scheduledJob', 'solid-core', moduleRef);\n  }\n}\n"]}
+{"version":3,"file":"scheduled-job.service.js","sourceRoot":"","sources":["../../src/services/scheduled-job.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA4F;AAC5F,uCAAyC;AACzC,6CAAsD;AAEtD,8DAA2D;AAC3D,qFAAiF;AACjF,qCAAwC;AACxC,iDAA6C;AAC7C,0EAA0E;AAGnE,IAAM,mBAAmB,2BAAzB,MAAM,mBAAoB,SAAQ,0BAAyB;IAGhE,YAEE,aAAqC,EAG5B,IAA4B,EAC5B,SAAoB,EACZ,aAA4B,EAC5B,gBAAsC;QAGvD,KAAK,CAAC,aAAa,EAAE,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;QAT3D,kBAAa,GAAb,aAAa,CAAe;QAG5B,SAAI,GAAJ,IAAI,CAAwB;QAC5B,cAAS,GAAT,SAAS,CAAW;QACZ,kBAAa,GAAb,aAAa,CAAe;QAC5B,qBAAgB,GAAhB,gBAAgB,CAAsB;QAVxC,WAAM,GAAG,IAAI,eAAM,CAAC,qBAAmB,CAAC,IAAI,CAAC,CAAC;IAc/D,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAU;QACzB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QACvD,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,IAAI,0BAAiB,CAAC,yBAAyB,EAAE,YAAY,CAAC,CAAC;QACvE,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,+BAA+B,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC5E,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,4BAAmB,CAAC,oCAAoC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;QAC/E,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wCAAwC,GAAG,CAAC,EAAE,SAAS,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;QAElF,MAAM,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAE3B,MAAM,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;QAC9B,GAAG,CAAC,SAAS,GAAG,UAAU,CAAC;QAC3B,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QACxE,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE1B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iDAAiD,GAAG,CAAC,EAAE,eAAe,GAAG,CAAC,SAAS,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;QAExH,OAAO,GAAG,CAAC;IACb,CAAC;CACF,CAAA;AAzCY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;IAKR,WAAA,IAAA,6BAAmB,GAAE,CAAA;qCACE,uBAAa;QAGtB,iDAAsB;QACjB,gBAAS;QACG,8BAAa;QACV,wCAAoB;GAX9C,mBAAmB,CAyC/B","sourcesContent":["import { BadRequestException, Injectable, Logger, NotFoundException } from '@nestjs/common';\nimport { ModuleRef } from \"@nestjs/core\";\nimport { InjectEntityManager } from '@nestjs/typeorm';\nimport { ScheduledJob } from 'src/entities/scheduled-job.entity';\nimport { SolidRegistry } from 'src/helpers/solid-registry';\nimport { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';\nimport { EntityManager } from 'typeorm';\nimport { CRUDService } from './crud.service';\nimport { SchedulerServiceImpl } from './scheduled-jobs/scheduler.service';\n\n@Injectable()\nexport class ScheduledJobService extends CRUDService<ScheduledJob> {\n  private readonly logger = new Logger(ScheduledJobService.name);\n\n  constructor(\n    @InjectEntityManager()\n    readonly entityManager: EntityManager,\n    // @InjectRepository(ScheduledJob)\n    // readonly repo: Repository<ScheduledJob>,\n    readonly repo: ScheduledJobRepository,\n    readonly moduleRef: ModuleRef,\n    private readonly solidRegistry: SolidRegistry,\n    private readonly schedulerService: SchedulerServiceImpl,\n\n  ) {\n    super(entityManager, repo, 'scheduledJob', 'solid-core', moduleRef);\n  }\n\n  async triggerRun(id: number): Promise<ScheduledJob> {\n    const job = await this.repo.findOne({ where: { id } });\n    if (!job) {\n      throw new NotFoundException(`Scheduled job with id ${id} not found`);\n    }\n\n    const handler = this.solidRegistry.getScheduledJobProviderInstance(job.job);\n    if (!handler) {\n      throw new BadRequestException(`Scheduled job handler not found: ${job.job}`);\n    }\n\n    this.logger.log(`Manually triggering scheduled job id=${job.id}, job=${job.job}`);\n\n    await handler.execute(job);\n\n    const finishedAt = new Date();\n    job.lastRunAt = finishedAt;\n    job.nextRunAt = this.schedulerService.computeNextRunAt(job, finishedAt);\n    await this.repo.save(job);\n\n    this.logger.log(`Completed manual trigger for scheduled job id=${job.id}, nextRunAt=${job.nextRunAt?.toISOString?.()}`);\n\n    return job;\n  }\n}\n"]}

package/dist/services/scheduled-jobs/scheduler.interface.d.ts

@@ -1,4 +1,6 @@
+import { ScheduledJob } from "src/entities/scheduled-job.entity";
 export interface ISchedulerService {
     runScheduledJobs(): Promise<void>;
+    computeNextRunAt(job: ScheduledJob, from: Date): Date;
 }
 //# sourceMappingURL=scheduler.interface.d.ts.map

package/dist/services/scheduled-jobs/scheduler.interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduler.interface.d.ts","sourceRoot":"","sources":["../../../src/services/scheduled-jobs/scheduler.interface.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,iBAAiB;IAC9B,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACrC"}
+{"version":3,"file":"scheduler.interface.d.ts","sourceRoot":"","sources":["../../../src/services/scheduled-jobs/scheduler.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAEjE,MAAM,WAAW,iBAAiB;IAC9B,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;CACzD"}

package/dist/services/scheduled-jobs/scheduler.interface.js.map

@@ -1 +1 @@
-{"version":3,"file":"scheduler.interface.js","sourceRoot":"","sources":["../../../src/services/scheduled-jobs/scheduler.interface.ts"],"names":[],"mappings":"","sourcesContent":["export interface ISchedulerService {\n    runScheduledJobs(): Promise<void>;\n}"]}
+{"version":3,"file":"scheduler.interface.js","sourceRoot":"","sources":["../../../src/services/scheduled-jobs/scheduler.interface.ts"],"names":[],"mappings":"","sourcesContent":["import { ScheduledJob } from \"src/entities/scheduled-job.entity\";\n\nexport interface ISchedulerService {\n    runScheduledJobs(): Promise<void>;\n    computeNextRunAt(job: ScheduledJob, from: Date): Date;\n}\n"]}

package/dist/services/scheduled-jobs/scheduler.service.d.ts

@@ -1,3 +1,4 @@
+import { ScheduledJob } from 'src/entities/scheduled-job.entity';
 import { SolidRegistry } from 'src/helpers/solid-registry';
 import { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';
 import { ISchedulerService } from './scheduler.interface';
@@ -9,7 +10,10 @@ export declare class SchedulerServiceImpl implements ISchedulerService {
     constructor(scheduledJobRepo: ScheduledJobRepository, solidRegistry: SolidRegistry);
     runScheduledJobs(): Promise<void>;
     private shouldRunNow;
-    private computeNextRunForCustomCron;
-    private computeNextRunAt;
+    private parseDayOfWeek;
+    private toDateOnly;
+    private toHHMM;
+    computeNextRunForCustomCron(job: ScheduledJob, from: Date): Date;
+    computeNextRunAt(job: ScheduledJob, from: Date): Date;
 }
 //# sourceMappingURL=scheduler.service.d.ts.map

package/dist/services/scheduled-jobs/scheduler.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduler.service.d.ts","sourceRoot":"","sources":["../../../src/services/scheduled-jobs/scheduler.service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D,qBACa,oBAAqB,YAAW,iBAAiB;IAOtD,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAPlC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyC;IAChE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;gBAK5B,gBAAgB,EAAE,sBAAsB,EACxC,aAAa,EAAE,aAAa;IAI3C,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAwEvC,OAAO,CAAC,YAAY;IA0CpB,OAAO,CAAC,2BAA2B;IA8BnC,OAAO,CAAC,gBAAgB;CAwB3B"}
+{"version":3,"file":"scheduler.service.d.ts","sourceRoot":"","sources":["../../../src/services/scheduled-jobs/scheduler.service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D,qBACa,oBAAqB,YAAW,iBAAiB;IAOtD,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAPlC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyC;IAChE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;gBAK5B,gBAAgB,EAAE,sBAAsB,EACxC,aAAa,EAAE,aAAa;IAI3C,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAwFvC,OAAO,CAAC,YAAY;IAwCpB,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,UAAU;IAgBlB,OAAO,CAAC,MAAM;IAoBP,2BAA2B,CAAC,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI;IAgChE,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI;CAwB/D"}

package/dist/services/scheduled-jobs/scheduler.service.js

@@ -27,12 +27,24 @@ let SchedulerServiceImpl = SchedulerServiceImpl_1 = class SchedulerServiceImpl {
     async runScheduledJobs() {
         const solidSchedulerEnabled = process.env.SOLID_SCHEDULER_ENABLED || "true";
         if (solidSchedulerEnabled.toLowerCase() !== "true") {
+            this.logger.debug('Solid scheduler is disabled via environment variable');
             return;
         }
         const solidCliRunning = process.env.SOLID_CLI_RUNNING || "false";
         if (solidCliRunning === "true") {
             return;
         }
+        const jobsRegexToEnable = (process.env.SOLID_SCHEDULER_JOBS_REGEX_TO_ENABLE || '').trim();
+        let jobsRegex = null;
+        if (jobsRegexToEnable && jobsRegexToEnable !== "all") {
+            try {
+                jobsRegex = new RegExp(jobsRegexToEnable);
+            }
+            catch (error) {
+                this.logger.error(`Invalid SOLID_SCHEDULER_JOBS_REGEX_TO_ENABLE regex "${jobsRegexToEnable}". Scheduler loop will skip this run.`);
+                return;
+            }
+        }
         const now = new Date();
         const dueJobs = await this.scheduledJobRepo.find({
             where: [
@@ -48,6 +60,11 @@ let SchedulerServiceImpl = SchedulerServiceImpl_1 = class SchedulerServiceImpl {
         });
         for (const job of dueJobs) {
             const jobKey = String(job.id ?? job.scheduleName ?? job.job);
+            const jobName = String(job.job ?? '');
+            if (jobsRegex && !jobsRegex.test(jobName)) {
+                this.logger.log(`[${now.getTime()}]: scheduler service skipping job ${jobName} because it does not match SOLID_SCHEDULER_JOBS_REGEX_TO_ENABLE=${jobsRegexToEnable}`);
+                continue;
+            }
             if (this.runningJobs.has(jobKey)) {
                 this.logger.log(`[${now.getTime()}]: scheduler service skipping job ${job.job} because a run is already in progress`);
                 continue;
@@ -82,28 +99,27 @@ let SchedulerServiceImpl = SchedulerServiceImpl_1 = class SchedulerServiceImpl {
         }
     }
     shouldRunNow(job, now) {
-        const today = now.toISOString().split('T')[0];
-        const timeNow = now.toTimeString().slice(0, 5);
-        if (job.startDate && new Date(today) < new Date(job.startDate))
+        const today = new Date(now);
+        today.setHours(0, 0, 0, 0);
+        const timeNow = this.toHHMM(now);
+        const startDate = this.toDateOnly(job.startDate);
+        const endDate = this.toDateOnly(job.endDate);
+        if (startDate && today < startDate)
             return false;
-        if (job.endDate && new Date(today) > new Date(job.endDate))
+        if (endDate && today > endDate)
+            return false;
+        const jobStart = this.toHHMM(job.startTime);
+        const jobEnd = this.toHHMM(job.endTime);
+        if (jobStart && timeNow < jobStart)
+            return false;
+        if (jobEnd && timeNow > jobEnd)
             return false;
-        if (job.startTime) {
-            const jobStart = job.startTime.toTimeString().slice(0, 5);
-            if (timeNow < jobStart)
-                return false;
-        }
-        if (job.endTime) {
-            const jobEnd = job.endTime.toTimeString().slice(0, 5);
-            if (timeNow > jobEnd)
-                return false;
-        }
         if (job.frequency.toLowerCase() === 'custom') {
             return true;
         }
         if (job.frequency.toLowerCase() === 'weekly' && job.dayOfWeek) {
             const todayName = now.toLocaleString('en-US', { weekday: 'long' });
-            const days = JSON.parse(job.dayOfWeek);
+            const days = this.parseDayOfWeek(job.dayOfWeek);
             if (!days.includes(todayName))
                 return false;
         }
@@ -114,6 +130,47 @@ let SchedulerServiceImpl = SchedulerServiceImpl_1 = class SchedulerServiceImpl {
         }
         return true;
     }
+    parseDayOfWeek(dayOfWeek) {
+        try {
+            const parsed = JSON.parse(dayOfWeek);
+            return Array.isArray(parsed) ? parsed : [];
+        }
+        catch (error) {
+            this.logger.warn(`Invalid dayOfWeek JSON '${dayOfWeek}'`, error);
+            return [];
+        }
+    }
+    toDateOnly(value) {
+        if (!value)
+            return null;
+        if (value instanceof Date) {
+            const d = new Date(value);
+            d.setHours(0, 0, 0, 0);
+            return d;
+        }
+        const parsed = new Date(value);
+        if (Number.isNaN(parsed.getTime()))
+            return null;
+        parsed.setHours(0, 0, 0, 0);
+        return parsed;
+    }
+    toHHMM(value) {
+        if (!value)
+            return null;
+        if (value instanceof Date) {
+            return value.toTimeString().slice(0, 5);
+        }
+        if (typeof value === 'string') {
+            const match = value.match(/^(\d{2}):(\d{2})/);
+            if (match)
+                return `${match[1]}:${match[2]}`;
+            const parsed = new Date(value);
+            if (!Number.isNaN(parsed.getTime())) {
+                return parsed.toTimeString().slice(0, 5);
+            }
+        }
+        return null;
+    }
     computeNextRunForCustomCron(job, from) {
         const base = new Date(from);
         if (!job.cronExpression) {
@@ -126,14 +183,15 @@ let SchedulerServiceImpl = SchedulerServiceImpl_1 = class SchedulerServiceImpl {
                 tz: 'UTC'
             });
             const nextRun = interval.next().toDate();
-            if (nextRun.getTime() - from.getTime() < 60000) {
+            const runAfterNext = interval.next().toDate();
+            if (runAfterNext.getTime() - nextRun.getTime() < 60000) {
                 throw new Error('Cron expression interval must be at least 1 minute');
             }
             this.logger.log(`Custom cron '${job.cronExpression}' next run: ${nextRun}`);
             return nextRun;
         }
         catch (error) {
-            this.logger.error(`Invalid cron expression for job ${job.scheduleName}: ${job.cronExpression}`, error);
+            this.logger.error(`Invalid cron expression for job ${job.scheduleName}: ${job.cronExpression}. Reason: ${error.message}`);
             return new Date(base.getTime() + 24 * 60 * 60 * 1000);
         }
     }

package/dist/services/scheduled-jobs/scheduler.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"scheduler.service.js","sourceRoot":"","sources":["../../../src/services/scheduled-jobs/scheduler.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Logger } from '@nestjs/common';\nimport { IsNull, LessThanOrEqual } from 'typeorm';\n\nimport { Cron, CronExpression } from '@nestjs/schedule';\nimport { ScheduledJob } from 'src/entities/scheduled-job.entity';\nimport { SolidRegistry } from 'src/helpers/solid-registry';\nimport { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';\nimport { ISchedulerService } from './scheduler.interface';\nimport { CronExpressionParser } from 'cron-parser';\n\n@Injectable()\nexport class SchedulerServiceImpl implements ISchedulerService {\n    private readonly logger = new Logger(SchedulerServiceImpl.name);\n    private readonly runningJobs = new Set<string>();\n\n    constructor(\n        // @InjectRepository(ScheduledJob)\n        // private readonly scheduledJobRepo: Repository<ScheduledJob>,\n        private readonly scheduledJobRepo: ScheduledJobRepository,\n        private readonly solidRegistry: SolidRegistry,\n    ) { }\n\n    @Cron(CronExpression.EVERY_MINUTE)\n    async runScheduledJobs(): Promise<void> {\n        const solidSchedulerEnabled = process.env.SOLID_SCHEDULER_ENABLED || \"true\";\n        if (solidSchedulerEnabled.toLowerCase() !== \"true\") {\n            // this.logger.debug('Solid scheduler is disabled via environment variable');\n            return;\n        }\n        const solidCliRunning = process.env.SOLID_CLI_RUNNING || \"false\";\n        if (solidCliRunning === \"true\") {\n            return;\n        }\n\n        const now = new Date();\n\n        // this.logger.log(`[${now.getTime()}]: scheduler service started run...`);\n        const dueJobs = await this.scheduledJobRepo.find({\n            where: [\n                {\n                    isActive: true,\n                    nextRunAt: LessThanOrEqual(now),\n                },\n                // Newly created jobs are also picked for examination \n                {\n                    isActive: true,\n                    nextRunAt: IsNull(),\n                },\n            ],\n        });\n\n        // this.logger.log(`[${now.getTime()}]: scheduler service identified ${dueJobs.length} jobs to run...`);\n\n        for (const job of dueJobs) {\n            const jobKey = String(job.id ?? job.scheduleName ?? job.job);\n\n            if (this.runningJobs.has(jobKey)) {\n                this.logger.log(`[${now.getTime()}]: scheduler service skipping job ${job.job} because a run is already in progress`);\n                continue;\n            }\n\n            if (!this.shouldRunNow(job, now)) {\n                this.logger.log(`[${now.getTime()}]: scheduler service skipping job ${job.job}`);\n                continue;\n            }\n\n            const handler = this.solidRegistry.getScheduledJobProviderInstance(job.job);\n            if (!handler) {\n                this.logger.warn(`[${now.getTime()}]: scheduler service skipping because job handler not found: ${job.job}`);\n                continue;\n            }\n\n            this.runningJobs.add(jobKey);\n            this.logger.log(`[${now.getTime()}]: scheduler service attempting to run job ${job.job}`);\n            try {\n                // this.logger.log(`[${now.getTime()}]: scheduler service about to run job ${job.job}`);\n                await handler.execute(job);\n                // this.logger.log(`[${now.getTime()}]: scheduler service finished running job ${job.job}`);\n\n                job.isActive = true;\n                const finishedAt = new Date();\n                job.lastRunAt = finishedAt;\n                job.nextRunAt = this.computeNextRunAt(job, finishedAt);\n                this.logger.log(`[${now.getTime()}]: scheduler service coomputed next run for ${job.job} as ${job.nextRunAt}`);\n\n                await this.scheduledJobRepo.save(job);\n                this.logger.log(`[${now.getTime()}]: scheduler service finished running job: ${job.job}`);\n            } catch (err) {\n                this.logger.error(`[${now.getTime()}]: scheduler service failed to run job ${job.job}`, err.stack);\n            } finally {\n                this.runningJobs.delete(jobKey);\n            }\n        }\n    }\n\n    private shouldRunNow(job: ScheduledJob, now: Date): boolean {\n        const today = now.toISOString().split('T')[0]; // yyyy-mm-dd\n        const timeNow = now.toTimeString().slice(0, 5); // hh:mm\n\n        // 1. Check startDate / endDate\n        if (job.startDate && new Date(today) < new Date(job.startDate)) return false;\n        if (job.endDate && new Date(today) > new Date(job.endDate)) return false;\n\n        // 2. Check startTime / endTime\n        if (job.startTime) {\n            const jobStart = job.startTime.toTimeString().slice(0, 5);\n            if (timeNow < jobStart) return false;\n        }\n        if (job.endTime) {\n            const jobEnd = job.endTime.toTimeString().slice(0, 5);\n            if (timeNow > jobEnd) return false;\n        }\n\n        // 3. Check custom frequency\n        if (job.frequency.toLowerCase() === 'custom') {\n            // Custom cron expressions handle their own scheduling logic\n            // Just check if nextRunAt is due, which was already checked in the query\n            return true;\n        }\n\n        // 3. Check dayOfWeek (for weekly)\n        if (job.frequency.toLowerCase() === 'weekly' && job.dayOfWeek) {\n            const todayName = now.toLocaleString('en-US', { weekday: 'long' }); // e.g., \"Monday\"\n            // const days = job.dayOfWeek.split(',').map(d => d.trim());\n            const days = JSON.parse(job.dayOfWeek) as string[];\n            if (!days.includes(todayName)) return false;\n        }\n\n        // 4. Check dayOfMonth (for monthly)\n        if (job.frequency.toLowerCase() === 'monthly' && job.dayOfMonth) {\n            const dom = now.getDate();\n            if (dom !== job.dayOfMonth) return false;\n        }\n\n        return true;\n    }\n\n    private computeNextRunForCustomCron(job: ScheduledJob, from: Date): Date {\n        const base = new Date(from);\n\n        if (!job.cronExpression) {\n            this.logger.error(`Custom frequency requires cronExpression for job ${job.scheduleName}`);\n            // Fallback to daily if cron expression is missing\n            return new Date(base.getTime() + 24 * 60 * 60 * 1000);\n        }\n\n        try {\n            const interval = CronExpressionParser.parse(job.cronExpression, {\n                currentDate: from,\n                tz: 'UTC'\n            });\n            const nextRun = interval.next().toDate();\n\n            // Validate minimum 1 minute interval\n            if (nextRun.getTime() - from.getTime() < 60000) {\n                throw new Error('Cron expression interval must be at least 1 minute');\n            }\n            \n            this.logger.log(`Custom cron '${job.cronExpression}' next run: ${nextRun}`);\n            return nextRun;\n        } catch (error) {\n            this.logger.error(`Invalid cron expression for job ${job.scheduleName}: ${job.cronExpression}`, error);\n            // Fallback to daily if cron parsing fails\n            return new Date(base.getTime() + 24 * 60 * 60 * 1000);\n        }\n    }\n\n    private computeNextRunAt(job: ScheduledJob, from: Date): Date {\n        const base = new Date(from);\n\n        switch (job.frequency.toLowerCase()) {\n            // case 'once':\n            //     return null; // don't reschedule\n            case 'every minute':\n                return new Date(base.getTime() + 1 * 60 * 1000);\n            case 'hourly':\n                return new Date(base.getTime() + 60 * 60 * 1000);\n            case 'daily':\n                return new Date(base.getTime() + 24 * 60 * 60 * 1000);\n            case 'weekly':\n                return new Date(base.getTime() + 7 * 24 * 60 * 60 * 1000);\n            case 'monthly':\n                const next = new Date(base);\n                next.setMonth(base.getMonth() + 1);\n                return next;\n            case 'custom':\n                return this.computeNextRunForCustomCron(job, from);\n            default:\n                return new Date(base.getTime() + 24 * 60 * 60 * 1000);\n        }\n    }\n}\n"]}
+{"version":3,"file":"scheduler.service.js","sourceRoot":"","sources":["../../../src/services/scheduled-jobs/scheduler.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AACpD,qCAAkD;AAElD,+CAAwD;AAExD,iEAA2D;AAC3D,wFAAiF;AAEjF,6CAAmD;AAG5C,IAAM,oBAAoB,4BAA1B,MAAM,oBAAoB;IAI7B,YAGqB,gBAAwC,EACxC,aAA4B;QAD5B,qBAAgB,GAAhB,gBAAgB,CAAwB;QACxC,kBAAa,GAAb,aAAa,CAAe;QAPhC,WAAM,GAAG,IAAI,eAAM,CAAC,sBAAoB,CAAC,IAAI,CAAC,CAAC;QAC/C,gBAAW,GAAG,IAAI,GAAG,EAAU,CAAC;IAO7C,CAAC;IAGC,AAAN,KAAK,CAAC,gBAAgB;QAClB,MAAM,qBAAqB,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,MAAM,CAAC;QAC5E,IAAI,qBAAqB,CAAC,WAAW,EAAE,KAAK,MAAM,EAAE,CAAC;YACjD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;YAC1E,OAAO;QACX,CAAC;QACD,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,OAAO,CAAC;QACjE,IAAI,eAAe,KAAK,MAAM,EAAE,CAAC;YAC7B,OAAO;QACX,CAAC;QACD,MAAM,iBAAiB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,oCAAoC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC1F,IAAI,SAAS,GAAkB,IAAI,CAAC;QACpC,IAAI,iBAAiB,IAAI,iBAAiB,KAAK,KAAK,EAAE,CAAC;YACnD,IAAI,CAAC;gBACD,SAAS,GAAG,IAAI,MAAM,CAAC,iBAAiB,CAAC,CAAC;YAC9C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uDAAuD,iBAAiB,uCAAuC,CAAC,CAAC;gBACnI,OAAO;YACX,CAAC;QACL,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QAGvB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC;YAC7C,KAAK,EAAE;gBACH;oBACI,QAAQ,EAAE,IAAI;oBACd,SAAS,EAAE,IAAA,yBAAe,EAAC,GAAG,CAAC;iBAClC;gBAED;oBACI,QAAQ,EAAE,IAAI;oBACd,SAAS,EAAE,IAAA,gBAAM,GAAE;iBACtB;aACJ;SACJ,CAAC,CAAC;QAIH,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YACxB,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,YAAY,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;YAC7D,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;YAEtC,IAAI,SAAS,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBACxC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,qCAAqC,OAAO,mEAAmE,iBAAiB,EAAE,CAAC,CAAC;gBACrK,SAAS;YACb,CAAC;YAED,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC/B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,qCAAqC,GAAG,CAAC,GAAG,uCAAuC,CAAC,CAAC;gBACtH,SAAS;YACb,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;gBAC/B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,qCAAqC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;gBACjF,SAAS;YACb,CAAC;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,+BAA+B,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC5E,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,gEAAgE,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;gBAC7G,SAAS;YACb,CAAC;YAED,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC7B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,8CAA8C,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;YAC1F,IAAI,CAAC;gBAED,MAAM,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAG3B,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC;gBACpB,MAAM,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;gBAC9B,GAAG,CAAC,SAAS,GAAG,UAAU,CAAC;gBAC3B,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;gBACvD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,+CAA+C,GAAG,CAAC,GAAG,OAAO,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;gBAE/G,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACtC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,8CAA8C,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;YAC9F,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,0CAA0C,GAAG,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;YACvG,CAAC;oBAAS,CAAC;gBACP,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACpC,CAAC;QACL,CAAC;IACL,CAAC;IAEO,YAAY,CAAC,GAAiB,EAAE,GAAS;QAC7C,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC;QAC5B,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAGjC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAA4C,CAAC,CAAC;QACpF,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,OAA0C,CAAC,CAAC;QAChF,IAAI,SAAS,IAAI,KAAK,GAAG,SAAS;YAAE,OAAO,KAAK,CAAC;QACjD,IAAI,OAAO,IAAI,KAAK,GAAG,OAAO;YAAE,OAAO,KAAK,CAAC;QAG7C,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAA4C,CAAC,CAAC;QAC/E,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAA0C,CAAC,CAAC;QAC3E,IAAI,QAAQ,IAAI,OAAO,GAAG,QAAQ;YAAE,OAAO,KAAK,CAAC;QACjD,IAAI,MAAM,IAAI,OAAO,GAAG,MAAM;YAAE,OAAO,KAAK,CAAC;QAG7C,IAAI,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,KAAK,QAAQ,EAAE,CAAC;YAG3C,OAAO,IAAI,CAAC;QAChB,CAAC;QAGD,IAAI,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,KAAK,QAAQ,IAAI,GAAG,CAAC,SAAS,EAAE,CAAC;YAC5D,MAAM,SAAS,GAAG,GAAG,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;YACnE,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAChD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAAE,OAAO,KAAK,CAAC;QAChD,CAAC;QAGD,IAAI,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,KAAK,SAAS,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;YAC9D,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;YAC1B,IAAI,GAAG,KAAK,GAAG,CAAC,UAAU;gBAAE,OAAO,KAAK,CAAC;QAC7C,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,cAAc,CAAC,SAAiB;QACpC,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACrC,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,SAAS,GAAG,EAAE,KAAY,CAAC,CAAC;YACxE,OAAO,EAAE,CAAC;QACd,CAAC;IACL,CAAC;IAEO,UAAU,CAAC,KAAuC;QACtD,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;YACxB,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;YAC1B,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YACvB,OAAO,CAAC,CAAC;QACb,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/B,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAAE,OAAO,IAAI,CAAC;QAEhD,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5B,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,MAAM,CAAC,KAAuC;QAClD,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;YACxB,OAAO,KAAK,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC5B,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAC9C,IAAI,KAAK;gBAAE,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;YAE5C,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;gBAClC,OAAO,MAAM,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC7C,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,2BAA2B,CAAC,GAAiB,EAAE,IAAU;QAC5D,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;QAE5B,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oDAAoD,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC;YAE1F,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QAC1D,CAAC;QAED,IAAI,CAAC;YACD,MAAM,QAAQ,GAAG,kCAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,EAAE;gBAC5D,WAAW,EAAE,IAAI;gBACjB,EAAE,EAAE,KAAK;aACZ,CAAC,CAAC;YACH,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;YACzC,MAAM,YAAY,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;YAI9C,IAAI,YAAY,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,KAAK,EAAE,CAAC;gBACrD,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;YAC1E,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,GAAG,CAAC,cAAc,eAAe,OAAO,EAAE,CAAC,CAAC;YAC5E,OAAO,OAAO,CAAC;QACnB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,GAAG,CAAC,YAAY,KAAK,GAAG,CAAC,cAAc,aAAc,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;YAErI,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QAC1D,CAAC;IACL,CAAC;IAEM,gBAAgB,CAAC,GAAiB,EAAE,IAAU;QACjD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;QAE5B,QAAQ,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,CAAC;YAGlC,KAAK,cAAc;gBACf,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;YACpD,KAAK,QAAQ;gBACT,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;YACrD,KAAK,OAAO;gBACR,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;YAC1D,KAAK,QAAQ;gBACT,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;YAC9D,KAAK,SAAS;gBACV,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC5B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;gBACnC,OAAO,IAAI,CAAC;YAChB,KAAK,QAAQ;gBACT,OAAO,IAAI,CAAC,2BAA2B,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACvD;gBACI,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QAC9D,CAAC;IACL,CAAC;CACJ,CAAA;AAlPY,oDAAoB;AAYvB;IADL,IAAA,eAAI,EAAC,yBAAc,CAAC,YAAY,CAAC;;;;4DAuFjC;+BAlGQ,oBAAoB;IADhC,IAAA,mBAAU,GAAE;qCAQ8B,iDAAsB;QACzB,8BAAa;GARxC,oBAAoB,CAkPhC","sourcesContent":["import { Injectable, Logger } from '@nestjs/common';\nimport { IsNull, LessThanOrEqual } from 'typeorm';\n\nimport { Cron, CronExpression } from '@nestjs/schedule';\nimport { ScheduledJob } from 'src/entities/scheduled-job.entity';\nimport { SolidRegistry } from 'src/helpers/solid-registry';\nimport { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';\nimport { ISchedulerService } from './scheduler.interface';\nimport { CronExpressionParser } from 'cron-parser';\n\n@Injectable()\nexport class SchedulerServiceImpl implements ISchedulerService {\n    private readonly logger = new Logger(SchedulerServiceImpl.name);\n    private readonly runningJobs = new Set<string>();\n\n    constructor(\n        // @InjectRepository(ScheduledJob)\n        // private readonly scheduledJobRepo: Repository<ScheduledJob>,\n        private readonly scheduledJobRepo: ScheduledJobRepository,\n        private readonly solidRegistry: SolidRegistry,\n    ) { }\n\n    @Cron(CronExpression.EVERY_MINUTE)\n    async runScheduledJobs(): Promise<void> {\n        const solidSchedulerEnabled = process.env.SOLID_SCHEDULER_ENABLED || \"true\";\n        if (solidSchedulerEnabled.toLowerCase() !== \"true\") {\n            this.logger.debug('Solid scheduler is disabled via environment variable');\n            return;\n        }\n        const solidCliRunning = process.env.SOLID_CLI_RUNNING || \"false\";\n        if (solidCliRunning === \"true\") {\n            return;\n        }\n        const jobsRegexToEnable = (process.env.SOLID_SCHEDULER_JOBS_REGEX_TO_ENABLE || '').trim();\n        let jobsRegex: RegExp | null = null;\n        if (jobsRegexToEnable && jobsRegexToEnable !== \"all\") {\n            try {\n                jobsRegex = new RegExp(jobsRegexToEnable);\n            } catch (error) {\n                this.logger.error(`Invalid SOLID_SCHEDULER_JOBS_REGEX_TO_ENABLE regex \"${jobsRegexToEnable}\". Scheduler loop will skip this run.`);\n                return;\n            }\n        }\n\n        const now = new Date();\n\n        // this.logger.log(`[${now.getTime()}]: scheduler service started run...`);\n        const dueJobs = await this.scheduledJobRepo.find({\n            where: [\n                {\n                    isActive: true,\n                    nextRunAt: LessThanOrEqual(now),\n                },\n                // Newly created jobs are also picked for examination \n                {\n                    isActive: true,\n                    nextRunAt: IsNull(),\n                },\n            ],\n        });\n\n        // this.logger.log(`[${now.getTime()}]: scheduler service identified ${dueJobs.length} jobs to run...`);\n\n        for (const job of dueJobs) {\n            const jobKey = String(job.id ?? job.scheduleName ?? job.job);\n            const jobName = String(job.job ?? '');\n\n            if (jobsRegex && !jobsRegex.test(jobName)) {\n                this.logger.log(`[${now.getTime()}]: scheduler service skipping job ${jobName} because it does not match SOLID_SCHEDULER_JOBS_REGEX_TO_ENABLE=${jobsRegexToEnable}`);\n                continue;\n            }\n\n            if (this.runningJobs.has(jobKey)) {\n                this.logger.log(`[${now.getTime()}]: scheduler service skipping job ${job.job} because a run is already in progress`);\n                continue;\n            }\n\n            if (!this.shouldRunNow(job, now)) {\n                this.logger.log(`[${now.getTime()}]: scheduler service skipping job ${job.job}`);\n                continue;\n            }\n\n            const handler = this.solidRegistry.getScheduledJobProviderInstance(job.job);\n            if (!handler) {\n                this.logger.warn(`[${now.getTime()}]: scheduler service skipping because job handler not found: ${job.job}`);\n                continue;\n            }\n\n            this.runningJobs.add(jobKey);\n            this.logger.log(`[${now.getTime()}]: scheduler service attempting to run job ${job.job}`);\n            try {\n                // this.logger.log(`[${now.getTime()}]: scheduler service about to run job ${job.job}`);\n                await handler.execute(job);\n                // this.logger.log(`[${now.getTime()}]: scheduler service finished running job ${job.job}`);\n\n                job.isActive = true;\n                const finishedAt = new Date();\n                job.lastRunAt = finishedAt;\n                job.nextRunAt = this.computeNextRunAt(job, finishedAt);\n                this.logger.log(`[${now.getTime()}]: scheduler service coomputed next run for ${job.job} as ${job.nextRunAt}`);\n\n                await this.scheduledJobRepo.save(job);\n                this.logger.log(`[${now.getTime()}]: scheduler service finished running job: ${job.job}`);\n            } catch (err) {\n                this.logger.error(`[${now.getTime()}]: scheduler service failed to run job ${job.job}`, err.stack);\n            } finally {\n                this.runningJobs.delete(jobKey);\n            }\n        }\n    }\n\n    private shouldRunNow(job: ScheduledJob, now: Date): boolean {\n        const today = new Date(now);\n        today.setHours(0, 0, 0, 0);\n        const timeNow = this.toHHMM(now); // hh:mm\n\n        // 1. Check startDate / endDate\n        const startDate = this.toDateOnly(job.startDate as unknown as Date | string | null);\n        const endDate = this.toDateOnly(job.endDate as unknown as Date | string | null);\n        if (startDate && today < startDate) return false;\n        if (endDate && today > endDate) return false;\n\n        // 2. Check startTime / endTime\n        const jobStart = this.toHHMM(job.startTime as unknown as Date | string | null);\n        const jobEnd = this.toHHMM(job.endTime as unknown as Date | string | null);\n        if (jobStart && timeNow < jobStart) return false;\n        if (jobEnd && timeNow > jobEnd) return false;\n\n        // 3. Check custom frequency\n        if (job.frequency.toLowerCase() === 'custom') {\n            // Custom cron expressions handle their own scheduling logic\n            // Just check if nextRunAt is due, which was already checked in the query\n            return true;\n        }\n\n        // 3. Check dayOfWeek (for weekly)\n        if (job.frequency.toLowerCase() === 'weekly' && job.dayOfWeek) {\n            const todayName = now.toLocaleString('en-US', { weekday: 'long' }); // e.g., \"Monday\"\n            const days = this.parseDayOfWeek(job.dayOfWeek);\n            if (!days.includes(todayName)) return false;\n        }\n\n        // 4. Check dayOfMonth (for monthly)\n        if (job.frequency.toLowerCase() === 'monthly' && job.dayOfMonth) {\n            const dom = now.getDate();\n            if (dom !== job.dayOfMonth) return false;\n        }\n\n        return true;\n    }\n\n    private parseDayOfWeek(dayOfWeek: string): string[] {\n        try {\n            const parsed = JSON.parse(dayOfWeek);\n            return Array.isArray(parsed) ? parsed : [];\n        } catch (error) {\n            this.logger.warn(`Invalid dayOfWeek JSON '${dayOfWeek}'`, error as any);\n            return [];\n        }\n    }\n\n    private toDateOnly(value: Date | string | null | undefined): Date | null {\n        if (!value) return null;\n\n        if (value instanceof Date) {\n            const d = new Date(value);\n            d.setHours(0, 0, 0, 0);\n            return d;\n        }\n\n        const parsed = new Date(value);\n        if (Number.isNaN(parsed.getTime())) return null;\n\n        parsed.setHours(0, 0, 0, 0);\n        return parsed;\n    }\n\n    private toHHMM(value: Date | string | null | undefined): string | null {\n        if (!value) return null;\n\n        if (value instanceof Date) {\n            return value.toTimeString().slice(0, 5);\n        }\n\n        if (typeof value === 'string') {\n            const match = value.match(/^(\\d{2}):(\\d{2})/);\n            if (match) return `${match[1]}:${match[2]}`;\n\n            const parsed = new Date(value);\n            if (!Number.isNaN(parsed.getTime())) {\n                return parsed.toTimeString().slice(0, 5);\n            }\n        }\n\n        return null;\n    }\n\n    public computeNextRunForCustomCron(job: ScheduledJob, from: Date): Date {\n        const base = new Date(from);\n\n        if (!job.cronExpression) {\n            this.logger.error(`Custom frequency requires cronExpression for job ${job.scheduleName}`);\n            // Fallback to daily if cron expression is missing\n            return new Date(base.getTime() + 24 * 60 * 60 * 1000);\n        }\n\n        try {\n            const interval = CronExpressionParser.parse(job.cronExpression, {\n                currentDate: from,\n                tz: 'UTC'\n            });\n            const nextRun = interval.next().toDate();\n            const runAfterNext = interval.next().toDate();\n\n            // Validate minimum 1 minute cadence between consecutive runs.\n            // Comparing nextRun to \"from\" is incorrect near minute boundaries.\n            if (runAfterNext.getTime() - nextRun.getTime() < 60000) {\n                throw new Error('Cron expression interval must be at least 1 minute');\n            }\n            \n            this.logger.log(`Custom cron '${job.cronExpression}' next run: ${nextRun}`);\n            return nextRun;\n        } catch (error) {\n            this.logger.error(`Invalid cron expression for job ${job.scheduleName}: ${job.cronExpression}. Reason: ${(error as Error).message}`);\n            // Fallback to daily if cron parsing fails\n            return new Date(base.getTime() + 24 * 60 * 60 * 1000);\n        }\n    }\n\n    public computeNextRunAt(job: ScheduledJob, from: Date): Date {\n        const base = new Date(from);\n\n        switch (job.frequency.toLowerCase()) {\n            // case 'once':\n            //     return null; // don't reschedule\n            case 'every minute':\n                return new Date(base.getTime() + 1 * 60 * 1000);\n            case 'hourly':\n                return new Date(base.getTime() + 60 * 60 * 1000);\n            case 'daily':\n                return new Date(base.getTime() + 24 * 60 * 60 * 1000);\n            case 'weekly':\n                return new Date(base.getTime() + 7 * 24 * 60 * 60 * 1000);\n            case 'monthly':\n                const next = new Date(base);\n                next.setMonth(base.getMonth() + 1);\n                return next;\n            case 'custom':\n                return this.computeNextRunForCustomCron(job, from);\n            default:\n                return new Date(base.getTime() + 24 * 60 * 60 * 1000);\n        }\n    }\n}\n"]}

package/dist/services/selection-providers/list-of-dashboard-question-providers-selection-provider.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list-of-dashboard-question-providers-selection-provider.service.d.ts","sourceRoot":"","sources":["../../../src/services/selection-providers/list-of-dashboard-question-providers-selection-provider.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAuE,kBAAkB,EAAE,yBAAyB,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAIhL,qBAEa,iDAAkD,YAAW,kBAAkB,CAAC,yBAAyB,CAAC;IAG/G,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAIjD,IAAI,IAAI,MAAM;IAId,IAAI,IAAI,MAAM;IAIR,KAAK,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,yBAAyB,GAAG,OAAO,CAAC,wBAAwB,GAAG,GAAG,CAAC;IASpG,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,yBAAyB,GAAG,OAAO,CAAC,SAAS,wBAAwB,EAAE,CAAC;CAO7G"}
+{"version":3,"file":"list-of-dashboard-question-providers-selection-provider.service.d.ts","sourceRoot":"","sources":["../../../src/services/selection-providers/list-of-dashboard-question-providers-selection-provider.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAuE,kBAAkB,EAAE,yBAAyB,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAKhL,qBAEa,iDAAkD,YAAW,kBAAkB,CAAC,yBAAyB,CAAC;IAG/G,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAIjD,IAAI,IAAI,MAAM;IAId,IAAI,IAAI,MAAM;IAIR,KAAK,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,yBAAyB,GAAG,OAAO,CAAC,wBAAwB,GAAG,GAAG,CAAC;IASpG,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,yBAAyB,GAAG,OAAO,CAAC,SAAS,wBAAwB,EAAE,CAAC;CAS7G"}