@solidxai/core 0.1.0 → 0.1.1

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;IAMtD,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa;IANlC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyC;gBAK3C,gBAAgB,EAAE,sBAAsB,EACxC,aAAa,EAAE,aAAa;IAI3C,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAwDvC,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":"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"}

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

@@ -22,8 +22,13 @@ let SchedulerServiceImpl = SchedulerServiceImpl_1 = class SchedulerServiceImpl {
         this.scheduledJobRepo = scheduledJobRepo;
         this.solidRegistry = solidRegistry;
         this.logger = new common_1.Logger(SchedulerServiceImpl_1.name);
+        this.runningJobs = new Set();
     }
     async runScheduledJobs() {
+        const solidSchedulerEnabled = process.env.SOLID_SCHEDULER_ENABLED || "true";
+        if (solidSchedulerEnabled.toLowerCase() !== "true") {
+            return;
+        }
         const solidCliRunning = process.env.SOLID_CLI_RUNNING || "false";
         if (solidCliRunning === "true") {
             return;
@@ -42,20 +47,28 @@ let SchedulerServiceImpl = SchedulerServiceImpl_1 = class SchedulerServiceImpl {
             ],
         });
         for (const job of dueJobs) {
+            const jobKey = String(job.id ?? job.scheduleName ?? job.job);
+            if (this.runningJobs.has(jobKey)) {
+                this.logger.log(`[${now.getTime()}]: scheduler service skipping job ${job.job} because a run is already in progress`);
+                continue;
+            }
+            if (!this.shouldRunNow(job, now)) {
+                this.logger.log(`[${now.getTime()}]: scheduler service skipping job ${job.job}`);
+                continue;
+            }
+            const handler = this.solidRegistry.getScheduledJobProviderInstance(job.job);
+            if (!handler) {
+                this.logger.warn(`[${now.getTime()}]: scheduler service skipping because job handler not found: ${job.job}`);
+                continue;
+            }
+            this.runningJobs.add(jobKey);
             this.logger.log(`[${now.getTime()}]: scheduler service attempting to run job ${job.job}`);
             try {
-                if (!this.shouldRunNow(job, now)) {
-                    this.logger.log(`[${now.getTime()}]: scheduler service skipping job ${job.job}`);
-                    continue;
-                }
-                const handler = this.solidRegistry.getScheduledJobProviderInstance(job.job);
-                if (!handler) {
-                    continue;
-                }
                 await handler.execute(job);
                 job.isActive = true;
-                job.lastRunAt = now;
-                job.nextRunAt = this.computeNextRunAt(job, now);
+                const finishedAt = new Date();
+                job.lastRunAt = finishedAt;
+                job.nextRunAt = this.computeNextRunAt(job, finishedAt);
                 this.logger.log(`[${now.getTime()}]: scheduler service coomputed next run for ${job.job} as ${job.nextRunAt}`);
                 await this.scheduledJobRepo.save(job);
                 this.logger.log(`[${now.getTime()}]: scheduler service finished running job: ${job.job}`);
@@ -63,6 +76,9 @@ let SchedulerServiceImpl = SchedulerServiceImpl_1 = class SchedulerServiceImpl {
             catch (err) {
                 this.logger.error(`[${now.getTime()}]: scheduler service failed to run job ${job.job}`, err.stack);
             }
+            finally {
+                this.runningJobs.delete(jobKey);
+            }
         }
     }
     shouldRunNow(job, now) {

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\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 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            this.logger.log(`[${now.getTime()}]: scheduler service attempting to run job ${job.job}`);\n            try {\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.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                job.lastRunAt = now;\n                job.nextRunAt = this.computeNextRunAt(job, now);\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            }\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}"]}
+{"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"]}