@orion-js/dogs 4.3.4 → 4.3.6

package/dist/index.d.cts

@@ -1,4 +1,3 @@
-import * as _orion_js_schema from '@orion-js/schema';
 import { SchemaInAnyOrionForm, Blackbox, InferSchemaType } from '@orion-js/schema';
 import { OrionLogger } from '@orion-js/logger';
 import { Collection, MongoDB } from '@orion-js/mongodb';
@@ -65,115 +64,16 @@ interface ScheduleJobsResult {
     }>;
 }
 
-declare const HistoryRecordSchema: {
-    _id: {
-        type: "string";
-    };
-    jobId: {
-        type: "string";
-    };
-    executionId: {
-        type: "string";
-    };
-    jobName: {
-        type: "string";
-    };
-    type: {
-        type: "string";
-    };
-    priority: {
-        type: "number";
-    };
-    tries: {
-        type: "number";
-    };
-    uniqueIdentifier: {
-        type: "string";
-        optional: true;
-    };
-    startedAt: {
-        type: "date";
-    };
-    endedAt: {
-        type: "date";
-    };
-    duration: {
-        type: "number";
-    };
-    expiresAt: {
-        type: "date";
-        optional: true;
-    };
-    status: {
-        type: "string";
-        enum: string[];
-    };
-    errorMessage: {
-        type: "string";
-        optional: true;
-    };
-    params: {
-        type: "blackbox";
-        optional: true;
-    };
-    result: {
-        type: "any";
-        optional: true;
-    };
-};
+declare const HistoryRecordSchema: any;
 type HistoryRecord = InferSchemaType<typeof HistoryRecordSchema>;
 
 /**
  * Enum representing the status of a job record.
  * - 'pending': Job is active and can be executed (default for existing records)
- * - 'maxTriesReached': Job has exhausted all retry attempts and won't be executed
+ * - 'maxTriesReached': Event job has exhausted all retry attempts and won't be executed
  */
-declare const JobStatusEnum: _orion_js_schema.FieldType<"pending" | "maxTriesReached">;
-declare const JobRecordSchema: {
-    _id: {
-        type: "string";
-    };
-    jobName: {
-        type: "string";
-    };
-    type: {
-        type: _orion_js_schema.FieldType<"recurrent" | "event">;
-    };
-    priority: {
-        type: "number";
-    };
-    uniqueIdentifier: {
-        type: "string";
-        optional: true;
-    };
-    nextRunAt: {
-        type: "date";
-    };
-    lastRunAt: {
-        type: "date";
-        optional: true;
-    };
-    lockedUntil: {
-        type: "date";
-        optional: true;
-    };
-    tries: {
-        type: "number";
-        optional: true;
-    };
-    params: {
-        type: "blackbox";
-        optional: true;
-    };
-    /**
-     * Status of the job. Optional for backwards compatibility with existing records.
-     * Records without this field are treated as 'pending'.
-     */
-    status: {
-        type: _orion_js_schema.FieldType<"pending" | "maxTriesReached">;
-        optional: true;
-    };
-};
+declare const JobStatusEnum: any;
+declare const JobRecordSchema: any;
 type JobRecord = InferSchemaType<typeof JobRecordSchema>;
 
 interface JobToRun {
@@ -249,12 +149,6 @@ interface BaseJobDefinition {
      * If not set, the defaultLockTime from config will be used.
      */
     lockTime?: number;
-    /**
-     * Maximum number of tries for this specific job before it is marked as 'maxTriesReached'.
-     * Overrides the global maxTries set in startWorkers config.
-     * If not set, the global maxTries from config will be used.
-     */
-    maxTries?: number;
 }
 interface RecurrentJobDefinition extends BaseJobDefinition {
     /**
@@ -269,6 +163,14 @@ interface RecurrentJobDefinition extends BaseJobDefinition {
      * Run every x milliseconds. This will be ignored if getNextRun is defined.
      */
     runEvery?: number;
+    /**
+     * Cron expression used to calculate the next run. Requires timezone.
+     */
+    cron?: string;
+    /**
+     * IANA timezone used to calculate cron-based schedules.
+     */
+    timezone?: string;
     /**
      * The priority of the job. Higher is more priority. Default is 100.
      */
@@ -283,6 +185,12 @@ interface EventJobDefinition<TParamsSchema extends SchemaInAnyOrionForm = any> e
      * Type of the job.
      */
     type: 'event';
+    /**
+     * Maximum number of tries for this specific event job before it is marked as 'maxTriesReached'.
+     * Overrides the global maxTries set in startWorkers config.
+     * If not set, the global maxTries from config will be used.
+     */
+    maxTries?: number;
     /**
      * Schedule of the job. Supports optional runIn (milliseconds) or runAt (Date) for delayed execution.
      */
@@ -306,13 +214,28 @@ interface EventJobDefinition<TParamsSchema extends SchemaInAnyOrionForm = any> e
     resolve: (params: InferSchemaType<TParamsSchema>, context: ExecutionContext) => Promise<any>;
 }
 type CreateEventJobOptions<TParamsSchema extends SchemaInAnyOrionForm = any> = Omit<EventJobDefinition<TParamsSchema>, 'type' | 'schedule' | 'scheduleJobs'>;
-type CreateRecurrentJobOptions = Omit<RecurrentJobDefinition, 'type' | 'runEvery'> & {
+type CreateRecurrentJobBaseOptions = Omit<RecurrentJobDefinition, 'type' | 'runEvery' | 'cron' | 'timezone'>;
+type CreateRecurrentJobRunEveryOptions = CreateRecurrentJobBaseOptions & {
     /**
      * Run every x milliseconds.
      * Accepts https://github.com/jkroso/parse-duration strings.
      */
     runEvery: number | string;
+    cron?: never;
+    timezone?: string;
 };
+type CreateRecurrentJobCronOptions = CreateRecurrentJobBaseOptions & {
+    /**
+     * Cron expression used to calculate the next run.
+     */
+    cron: string;
+    /**
+     * IANA timezone used to calculate cron-based schedules.
+     */
+    timezone: string;
+    runEvery?: never;
+};
+type CreateRecurrentJobOptions = CreateRecurrentJobRunEveryOptions | CreateRecurrentJobCronOptions;
 type CreateJobOptions<TParamsSchema extends SchemaInAnyOrionForm = any> = CreateEventJobOptions<TParamsSchema> | CreateRecurrentJobOptions;
 type JobDefinition<TParamsSchema extends SchemaInAnyOrionForm = any> = RecurrentJobDefinition | EventJobDefinition<TParamsSchema>;
 type JobDefinitionWithName<TParamsSchema extends SchemaInAnyOrionForm = any> = JobDefinition<TParamsSchema> & {
@@ -329,16 +252,16 @@ interface StartWorkersConfig {
      */
     jobs: JobsDefinition;
     /**
-     * Maximum number of tries for a job before it is marked as 'maxTriesReached'.
-     * This is a required global default that can be overridden per job definition.
+     * Maximum number of tries for an event job before it is marked as 'maxTriesReached'.
+     * This is a global default that can be overridden per event job definition.
      */
-    maxTries: number;
+    maxTries?: number;
     /**
-     * Callback invoked when a job reaches its maximum tries limit.
+     * Callback invoked when an event job reaches its maximum tries limit.
      * Use this to notify administrators (e.g., send an email alert).
      * The job will remain in the database with status 'maxTriesReached'.
      */
-    onMaxTriesReached: (job: JobToRun) => Promise<void>;
+    onMaxTriesReached?: (job: JobToRun) => Promise<void>;
     /**
      * Time in milliseconds to wait between each look without results for a job
      * to run at the database. Default is 3000.
@@ -380,7 +303,7 @@ declare class JobsRepo {
     }): Promise<void>;
     deleteEventJob(jobId: string): Promise<void>;
     /**
-     * Marks a job as having reached its maximum tries limit.
+     * Marks an event job as having reached its maximum tries limit.
      * The job will remain in the database but won't be picked up for execution.
      */
     markJobAsMaxTriesReached(jobId: string): Promise<void>;
@@ -427,4 +350,4 @@ declare const scheduleJob: <TParamsSchema extends SchemaInAnyOrionForm = any>(op
  */
 declare const scheduleJobs: <TParamsSchema extends SchemaInAnyOrionForm = any>(jobs: ScheduleJobsOptions<TParamsSchema>) => Promise<ScheduleJobsResult>;
 
-export { type BaseJobDefinition, type CreateEventJobOptions, type CreateJobOptions, type CreateRecurrentJobOptions, EventJob, type EventJobDefinition, type ExecutionContext, type HistoryRecord, HistoryRecordSchema, type JobDefinition, type JobDefinitionWithName, type JobRecord, JobRecordSchema, type JobRetryResult, type JobRetryResultBase, type JobRetryResultRunAt, type JobRetryResultRunIn, JobStatusEnum, type JobToRun, Jobs, type JobsDefinition, type LogLevels, RecurrentJob, type RecurrentJobDefinition, type ScheduleJobOptions, type ScheduleJobOptionsBase, type ScheduleJobOptionsRunAt, type ScheduleJobOptionsRunIn, type ScheduleJobOptionsWithoutName, type ScheduleJobRecordOptions, type ScheduleJobsOptions, type ScheduleJobsResult, type StartWorkersConfig, type WorkerInstance, type WorkersInstance, createEventJob, createRecurrentJob, defineJob, getServiceJobs, jobsHistoryRepo, jobsRepo, scheduleJob, scheduleJobs, startWorkers };
+export { type BaseJobDefinition, type CreateEventJobOptions, type CreateJobOptions, type CreateRecurrentJobCronOptions, type CreateRecurrentJobOptions, type CreateRecurrentJobRunEveryOptions, EventJob, type EventJobDefinition, type ExecutionContext, type HistoryRecord, HistoryRecordSchema, type JobDefinition, type JobDefinitionWithName, type JobRecord, JobRecordSchema, type JobRetryResult, type JobRetryResultBase, type JobRetryResultRunAt, type JobRetryResultRunIn, JobStatusEnum, type JobToRun, Jobs, type JobsDefinition, type LogLevels, RecurrentJob, type RecurrentJobDefinition, type ScheduleJobOptions, type ScheduleJobOptionsBase, type ScheduleJobOptionsRunAt, type ScheduleJobOptionsRunIn, type ScheduleJobOptionsWithoutName, type ScheduleJobRecordOptions, type ScheduleJobsOptions, type ScheduleJobsResult, type StartWorkersConfig, type WorkerInstance, type WorkersInstance, createEventJob, createRecurrentJob, defineJob, getServiceJobs, jobsHistoryRepo, jobsRepo, scheduleJob, scheduleJobs, startWorkers };

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-import * as _orion_js_schema from '@orion-js/schema';
 import { SchemaInAnyOrionForm, Blackbox, InferSchemaType } from '@orion-js/schema';
 import { OrionLogger } from '@orion-js/logger';
 import { Collection, MongoDB } from '@orion-js/mongodb';
@@ -65,115 +64,16 @@ interface ScheduleJobsResult {
     }>;
 }
 
-declare const HistoryRecordSchema: {
-    _id: {
-        type: "string";
-    };
-    jobId: {
-        type: "string";
-    };
-    executionId: {
-        type: "string";
-    };
-    jobName: {
-        type: "string";
-    };
-    type: {
-        type: "string";
-    };
-    priority: {
-        type: "number";
-    };
-    tries: {
-        type: "number";
-    };
-    uniqueIdentifier: {
-        type: "string";
-        optional: true;
-    };
-    startedAt: {
-        type: "date";
-    };
-    endedAt: {
-        type: "date";
-    };
-    duration: {
-        type: "number";
-    };
-    expiresAt: {
-        type: "date";
-        optional: true;
-    };
-    status: {
-        type: "string";
-        enum: string[];
-    };
-    errorMessage: {
-        type: "string";
-        optional: true;
-    };
-    params: {
-        type: "blackbox";
-        optional: true;
-    };
-    result: {
-        type: "any";
-        optional: true;
-    };
-};
+declare const HistoryRecordSchema: any;
 type HistoryRecord = InferSchemaType<typeof HistoryRecordSchema>;
 
 /**
  * Enum representing the status of a job record.
  * - 'pending': Job is active and can be executed (default for existing records)
- * - 'maxTriesReached': Job has exhausted all retry attempts and won't be executed
+ * - 'maxTriesReached': Event job has exhausted all retry attempts and won't be executed
  */
-declare const JobStatusEnum: _orion_js_schema.FieldType<"pending" | "maxTriesReached">;
-declare const JobRecordSchema: {
-    _id: {
-        type: "string";
-    };
-    jobName: {
-        type: "string";
-    };
-    type: {
-        type: _orion_js_schema.FieldType<"recurrent" | "event">;
-    };
-    priority: {
-        type: "number";
-    };
-    uniqueIdentifier: {
-        type: "string";
-        optional: true;
-    };
-    nextRunAt: {
-        type: "date";
-    };
-    lastRunAt: {
-        type: "date";
-        optional: true;
-    };
-    lockedUntil: {
-        type: "date";
-        optional: true;
-    };
-    tries: {
-        type: "number";
-        optional: true;
-    };
-    params: {
-        type: "blackbox";
-        optional: true;
-    };
-    /**
-     * Status of the job. Optional for backwards compatibility with existing records.
-     * Records without this field are treated as 'pending'.
-     */
-    status: {
-        type: _orion_js_schema.FieldType<"pending" | "maxTriesReached">;
-        optional: true;
-    };
-};
+declare const JobStatusEnum: any;
+declare const JobRecordSchema: any;
 type JobRecord = InferSchemaType<typeof JobRecordSchema>;
 
 interface JobToRun {
@@ -249,12 +149,6 @@ interface BaseJobDefinition {
      * If not set, the defaultLockTime from config will be used.
      */
     lockTime?: number;
-    /**
-     * Maximum number of tries for this specific job before it is marked as 'maxTriesReached'.
-     * Overrides the global maxTries set in startWorkers config.
-     * If not set, the global maxTries from config will be used.
-     */
-    maxTries?: number;
 }
 interface RecurrentJobDefinition extends BaseJobDefinition {
     /**
@@ -269,6 +163,14 @@ interface RecurrentJobDefinition extends BaseJobDefinition {
      * Run every x milliseconds. This will be ignored if getNextRun is defined.
      */
     runEvery?: number;
+    /**
+     * Cron expression used to calculate the next run. Requires timezone.
+     */
+    cron?: string;
+    /**
+     * IANA timezone used to calculate cron-based schedules.
+     */
+    timezone?: string;
     /**
      * The priority of the job. Higher is more priority. Default is 100.
      */
@@ -283,6 +185,12 @@ interface EventJobDefinition<TParamsSchema extends SchemaInAnyOrionForm = any> e
      * Type of the job.
      */
     type: 'event';
+    /**
+     * Maximum number of tries for this specific event job before it is marked as 'maxTriesReached'.
+     * Overrides the global maxTries set in startWorkers config.
+     * If not set, the global maxTries from config will be used.
+     */
+    maxTries?: number;
     /**
      * Schedule of the job. Supports optional runIn (milliseconds) or runAt (Date) for delayed execution.
      */
@@ -306,13 +214,28 @@ interface EventJobDefinition<TParamsSchema extends SchemaInAnyOrionForm = any> e
     resolve: (params: InferSchemaType<TParamsSchema>, context: ExecutionContext) => Promise<any>;
 }
 type CreateEventJobOptions<TParamsSchema extends SchemaInAnyOrionForm = any> = Omit<EventJobDefinition<TParamsSchema>, 'type' | 'schedule' | 'scheduleJobs'>;
-type CreateRecurrentJobOptions = Omit<RecurrentJobDefinition, 'type' | 'runEvery'> & {
+type CreateRecurrentJobBaseOptions = Omit<RecurrentJobDefinition, 'type' | 'runEvery' | 'cron' | 'timezone'>;
+type CreateRecurrentJobRunEveryOptions = CreateRecurrentJobBaseOptions & {
     /**
      * Run every x milliseconds.
      * Accepts https://github.com/jkroso/parse-duration strings.
      */
     runEvery: number | string;
+    cron?: never;
+    timezone?: string;
 };
+type CreateRecurrentJobCronOptions = CreateRecurrentJobBaseOptions & {
+    /**
+     * Cron expression used to calculate the next run.
+     */
+    cron: string;
+    /**
+     * IANA timezone used to calculate cron-based schedules.
+     */
+    timezone: string;
+    runEvery?: never;
+};
+type CreateRecurrentJobOptions = CreateRecurrentJobRunEveryOptions | CreateRecurrentJobCronOptions;
 type CreateJobOptions<TParamsSchema extends SchemaInAnyOrionForm = any> = CreateEventJobOptions<TParamsSchema> | CreateRecurrentJobOptions;
 type JobDefinition<TParamsSchema extends SchemaInAnyOrionForm = any> = RecurrentJobDefinition | EventJobDefinition<TParamsSchema>;
 type JobDefinitionWithName<TParamsSchema extends SchemaInAnyOrionForm = any> = JobDefinition<TParamsSchema> & {
@@ -329,16 +252,16 @@ interface StartWorkersConfig {
      */
     jobs: JobsDefinition;
     /**
-     * Maximum number of tries for a job before it is marked as 'maxTriesReached'.
-     * This is a required global default that can be overridden per job definition.
+     * Maximum number of tries for an event job before it is marked as 'maxTriesReached'.
+     * This is a global default that can be overridden per event job definition.
      */
-    maxTries: number;
+    maxTries?: number;
     /**
-     * Callback invoked when a job reaches its maximum tries limit.
+     * Callback invoked when an event job reaches its maximum tries limit.
      * Use this to notify administrators (e.g., send an email alert).
      * The job will remain in the database with status 'maxTriesReached'.
      */
-    onMaxTriesReached: (job: JobToRun) => Promise<void>;
+    onMaxTriesReached?: (job: JobToRun) => Promise<void>;
     /**
      * Time in milliseconds to wait between each look without results for a job
      * to run at the database. Default is 3000.
@@ -380,7 +303,7 @@ declare class JobsRepo {
     }): Promise<void>;
     deleteEventJob(jobId: string): Promise<void>;
     /**
-     * Marks a job as having reached its maximum tries limit.
+     * Marks an event job as having reached its maximum tries limit.
      * The job will remain in the database but won't be picked up for execution.
      */
     markJobAsMaxTriesReached(jobId: string): Promise<void>;
@@ -427,4 +350,4 @@ declare const scheduleJob: <TParamsSchema extends SchemaInAnyOrionForm = any>(op
  */
 declare const scheduleJobs: <TParamsSchema extends SchemaInAnyOrionForm = any>(jobs: ScheduleJobsOptions<TParamsSchema>) => Promise<ScheduleJobsResult>;
 
-export { type BaseJobDefinition, type CreateEventJobOptions, type CreateJobOptions, type CreateRecurrentJobOptions, EventJob, type EventJobDefinition, type ExecutionContext, type HistoryRecord, HistoryRecordSchema, type JobDefinition, type JobDefinitionWithName, type JobRecord, JobRecordSchema, type JobRetryResult, type JobRetryResultBase, type JobRetryResultRunAt, type JobRetryResultRunIn, JobStatusEnum, type JobToRun, Jobs, type JobsDefinition, type LogLevels, RecurrentJob, type RecurrentJobDefinition, type ScheduleJobOptions, type ScheduleJobOptionsBase, type ScheduleJobOptionsRunAt, type ScheduleJobOptionsRunIn, type ScheduleJobOptionsWithoutName, type ScheduleJobRecordOptions, type ScheduleJobsOptions, type ScheduleJobsResult, type StartWorkersConfig, type WorkerInstance, type WorkersInstance, createEventJob, createRecurrentJob, defineJob, getServiceJobs, jobsHistoryRepo, jobsRepo, scheduleJob, scheduleJobs, startWorkers };
+export { type BaseJobDefinition, type CreateEventJobOptions, type CreateJobOptions, type CreateRecurrentJobCronOptions, type CreateRecurrentJobOptions, type CreateRecurrentJobRunEveryOptions, EventJob, type EventJobDefinition, type ExecutionContext, type HistoryRecord, HistoryRecordSchema, type JobDefinition, type JobDefinitionWithName, type JobRecord, JobRecordSchema, type JobRetryResult, type JobRetryResultBase, type JobRetryResultRunAt, type JobRetryResultRunIn, JobStatusEnum, type JobToRun, Jobs, type JobsDefinition, type LogLevels, RecurrentJob, type RecurrentJobDefinition, type ScheduleJobOptions, type ScheduleJobOptionsBase, type ScheduleJobOptionsRunAt, type ScheduleJobOptionsRunIn, type ScheduleJobOptionsWithoutName, type ScheduleJobRecordOptions, type ScheduleJobsOptions, type ScheduleJobsResult, type StartWorkersConfig, type WorkerInstance, type WorkersInstance, createEventJob, createRecurrentJob, defineJob, getServiceJobs, jobsHistoryRepo, jobsRepo, scheduleJob, scheduleJobs, startWorkers };

package/dist/index.js

@@ -124,10 +124,12 @@ var JobsRepo = class {
       {
         jobName: { $in: jobNames },
         nextRunAt: { $lte: /* @__PURE__ */ new Date() },
-        $or: [{ lockedUntil: { $exists: false } }, { lockedUntil: { $lte: /* @__PURE__ */ new Date() } }],
-        // Exclude jobs that have reached max tries. Using $ne handles backwards compatibility
-        // since records without the status field will still match (undefined !== 'maxTriesReached')
-        status: { $ne: "maxTriesReached" }
+        $and: [
+          { $or: [{ lockedUntil: { $exists: false } }, { lockedUntil: { $lte: /* @__PURE__ */ new Date() } }] },
+          // Exclude event jobs that have reached max tries. Recurrent jobs keep running even
+          // if old records still have this status from previous versions.
+          { $or: [{ type: { $ne: "event" } }, { status: { $ne: "maxTriesReached" } }] }
+        ]
       },
       {
         $set: { lockedUntil, lastRunAt: /* @__PURE__ */ new Date() },
@@ -180,12 +182,12 @@ var JobsRepo = class {
     await this.jobs.deleteOne({ _id: jobId, type: "event" });
   }
   /**
-   * Marks a job as having reached its maximum tries limit.
+   * Marks an event job as having reached its maximum tries limit.
    * The job will remain in the database but won't be picked up for execution.
    */
   async markJobAsMaxTriesReached(jobId) {
     await this.jobs.updateOne(
-      { _id: jobId },
+      { _id: jobId, type: "event" },
       {
         $set: { status: "maxTriesReached" },
         $unset: { lockedUntil: "" }
@@ -231,6 +233,9 @@ var JobsRepo = class {
           type: job.type,
           priority: job.priority
         },
+        $unset: {
+          status: ""
+        },
         $setOnInsert: {
           nextRunAt: /* @__PURE__ */ new Date()
         }
@@ -310,6 +315,7 @@ JobsRepo = __decorateElement(_init, 0, "JobsRepo", _JobsRepo_decorators, JobsRep
 __runInitializers(_init, 1, JobsRepo);
 
 // src/services/getNextRunDate.ts
+import { CronExpressionParser } from "cron-parser";
 var getNextRunDate = (options) => {
   if (options.runIn) {
     return new Date(Date.now() + options.runIn);
@@ -317,6 +323,15 @@ var getNextRunDate = (options) => {
   if (options.runEvery) {
     return new Date(Date.now() + options.runEvery);
   }
+  if (options.cron) {
+    if (!options.timezone) {
+      throw new Error("Cron recurrent jobs require a timezone");
+    }
+    return CronExpressionParser.parse(options.cron, {
+      currentDate: options.currentDate ?? /* @__PURE__ */ new Date(),
+      tz: options.timezone
+    }).next().toDate();
+  }
   if (options.runAt) {
     return options.runAt;
   }
@@ -543,7 +558,7 @@ var Executor = class {
     return job;
   }
   /**
-   * Determines the effective max tries for a job.
+   * Determines the effective max tries for an event job.
    * Job-specific maxTries takes precedence over the global maxTries from config.
    */
   getEffectiveMaxTries(job, globalMaxTries) {
@@ -551,7 +566,7 @@ var Executor = class {
   }
   /**
    * Handles when a job has reached its maximum retry attempts.
-   * Marks the job in the database and invokes the onMaxTriesReached callback.
+   * Marks the job in the database and invokes the onMaxTriesReached callback when provided.
    */
   async handleMaxTriesReached(jobToRun, onMaxTriesReached) {
     const jobLogger = logger3.addMetadata({
@@ -562,6 +577,7 @@ var Executor = class {
       `Job "${jobToRun.name}" has exceeded max tries (${jobToRun.tries}). Marking as maxTriesReached.`
     );
     await this.jobsRepo.markJobAsMaxTriesReached(jobToRun.jobId);
+    if (!onMaxTriesReached) return;
     try {
       await onMaxTriesReached(jobToRun);
     } catch (callbackError) {
@@ -570,7 +586,7 @@ var Executor = class {
       });
     }
   }
-  async onError(error, job, jobToRun, context, config) {
+  async onError(error, job, jobToRun, context) {
     const scheduleRecurrent = async () => {
       if (job.type === "recurrent") {
         await this.jobsRepo.scheduleNextRun({
@@ -651,10 +667,12 @@ var Executor = class {
   async executeJob(config, jobToRun, respawnWorker) {
     const job = this.getJobDefinition(jobToRun, config.jobs);
     if (!job) return;
-    const effectiveMaxTries = this.getEffectiveMaxTries(job, config.maxTries);
-    if (jobToRun.tries > effectiveMaxTries) {
-      await this.handleMaxTriesReached(jobToRun, config.onMaxTriesReached);
-      return;
+    if (job.type === "event") {
+      const effectiveMaxTries = this.getEffectiveMaxTries(job, config.maxTries);
+      if (typeof effectiveMaxTries === "number" && jobToRun.tries > effectiveMaxTries) {
+        await this.handleMaxTriesReached(jobToRun, config.onMaxTriesReached);
+        return;
+      }
     }
     const effectiveLockTime = this.getEffectiveLockTime(job, jobToRun);
     if (effectiveLockTime !== jobToRun.lockTime) {
@@ -723,7 +741,7 @@ var Executor = class {
             }).catch((saveError) => {
               context.logger.error("Error saving failed execution history", { error: saveError });
             });
-            await this.onError(error, job, jobToRun, context, config);
+            await this.onError(error, job, jobToRun, context);
           }
         });
       } catch (error) {
@@ -910,7 +928,7 @@ var WorkerService = class {
   }
   /**
    * Starts the job workers with the provided configuration.
-   * @param userConfig - Configuration for the workers. Required fields: jobs, maxTries, onMaxTriesReached
+   * @param userConfig - Configuration for the workers. Required field: jobs
    */
   startWorkers(userConfig) {
     const config = {
@@ -943,6 +961,7 @@ import { getInstance, Service as Service4 } from "@orion-js/services";
 
 // src/defineJob/index.ts
 import { cleanAndValidate } from "@orion-js/schema";
+import { CronExpressionParser as CronExpressionParser2 } from "cron-parser";
 import parse from "parse-duration";
 function createEventJob(options) {
   const jobDefinition = {
@@ -981,11 +1000,22 @@ function createEventJob(options) {
   return jobDefinition;
 }
 function createRecurrentJob(options) {
+  const recurrentOptions = {
+    ...options
+  };
+  delete recurrentOptions.maxTries;
+  if ("cron" in recurrentOptions && recurrentOptions.cron && !recurrentOptions.timezone) {
+    throw new Error("Cron recurrent jobs require a timezone");
+  }
+  if ("cron" in recurrentOptions && recurrentOptions.cron) {
+    CronExpressionParser2.parse(recurrentOptions.cron, { tz: recurrentOptions.timezone }).next();
+  }
+  const runEvery = "runEvery" in recurrentOptions ? typeof recurrentOptions.runEvery === "string" ? parse(recurrentOptions.runEvery) : recurrentOptions.runEvery : void 0;
   const jobDefinition = {
-    ...options,
-    priority: options.priority ?? 100,
+    ...recurrentOptions,
+    priority: recurrentOptions.priority ?? 100,
     type: "recurrent",
-    runEvery: typeof options.runEvery === "string" ? parse(options.runEvery) : options.runEvery
+    runEvery
   };
   return jobDefinition;
 }