@open-mercato/scheduler 0.6.6-develop.6353.1.efc82affea → 0.6.6-develop.6356.1.4d780a65a3

package/dist/modules/scheduler/services/bullmqSchedulerService.js

@@ -22,6 +22,30 @@ class BullMQSchedulerService {
     }
     return this.queue;
   }
+  getScheduleJobName(scheduleId) {
+    return `schedule-${scheduleId}`;
+  }
+  getScheduleIdFromRepeatableJob(job) {
+    const candidate = job.id?.startsWith("schedule-") ? job.id : job.name?.startsWith("schedule-") ? job.name : null;
+    return candidate ? candidate.slice("schedule-".length) : null;
+  }
+  isRepeatableJobForSchedule(job, scheduleId) {
+    const jobName = this.getScheduleJobName(scheduleId);
+    return job.id === jobName || job.name === jobName;
+  }
+  async removeRepeatableJobsForSchedule(queue, scheduleId) {
+    const repeatableJobs = await queue.getRepeatableJobs?.();
+    if (!repeatableJobs || typeof queue.removeRepeatableByKey !== "function") {
+      return 0;
+    }
+    let removed = 0;
+    for (const job of repeatableJobs) {
+      if (!this.isRepeatableJobForSchedule(job, scheduleId)) continue;
+      await queue.removeRepeatableByKey(job.key);
+      removed += 1;
+    }
+    return removed;
+  }
   /**
    * Register a schedule with BullMQ repeatable jobs
    * @param schedule - The schedule to register
@@ -46,7 +70,8 @@ class BullMQSchedulerService {
       }
       const repeatOpts = this.buildRepeatOptions(schedule);
       const queue = await this.getQueue();
-      const jobName = `schedule-${schedule.id}`;
+      const jobName = this.getScheduleJobName(schedule.id);
+      await this.removeRepeatableJobsForSchedule(queue, schedule.id);
       const jobData = {
         id: jobName,
         payload: {
@@ -104,17 +129,12 @@ class BullMQSchedulerService {
   async unregister(scheduleId) {
     try {
       const queue = await this.getQueue();
-      const repeatableJobs = await queue.getRepeatableJobs?.();
-      if (repeatableJobs) {
-        for (const job of repeatableJobs) {
-          if (job.id === `schedule-${scheduleId}` || job.name === `schedule-${scheduleId}`) {
-            await queue.removeRepeatableByKey?.(job.key);
-            console.debug(`[scheduler:bullmq] Unregistered schedule: ${scheduleId}`);
-            return;
-          }
-        }
+      const removed = await this.removeRepeatableJobsForSchedule(queue, scheduleId);
+      if (removed > 0) {
+        console.debug(`[scheduler:bullmq] Unregistered schedule: ${scheduleId}`);
+      } else {
+        console.debug(`[scheduler:bullmq] No repeatable job found for schedule: ${scheduleId}`);
       }
-      console.debug(`[scheduler:bullmq] No repeatable job found for schedule: ${scheduleId}`);
     } catch (error) {
       console.error(`[scheduler:bullmq] Failed to unregister schedule: ${scheduleId}`, error);
       throw error;
@@ -129,9 +149,14 @@ class BullMQSchedulerService {
     const queue = await this.getQueue();
     console.debug("[scheduler:bullmq] Starting full sync...");
     const repeatableJobs = await queue.getRepeatableJobs?.() || [];
-    const bullmqScheduleIds = new Set(
-      repeatableJobs.filter((j) => j.id?.startsWith("schedule-") || j.name?.startsWith("schedule-")).map((j) => String(j.id || j.name).replace("schedule-", ""))
-    );
+    const bullmqScheduleIds = /* @__PURE__ */ new Set();
+    const bullmqScheduleCounts = /* @__PURE__ */ new Map();
+    for (const job of repeatableJobs) {
+      const scheduleId = this.getScheduleIdFromRepeatableJob(job);
+      if (!scheduleId) continue;
+      bullmqScheduleIds.add(scheduleId);
+      bullmqScheduleCounts.set(scheduleId, (bullmqScheduleCounts.get(scheduleId) ?? 0) + 1);
+    }
     const BATCH_SIZE = 500;
     const dbSchedules = [];
     let offset = 0;
@@ -149,6 +174,9 @@ class BullMQSchedulerService {
       if (!bullmqScheduleIds.has(schedule.id)) {
         console.debug(`[scheduler:bullmq] Registering missing schedule: ${schedule.name}`);
         await this.register(schedule);
+      } else if ((bullmqScheduleCounts.get(schedule.id) ?? 0) > 1) {
+        console.log(`[scheduler:bullmq] Repairing duplicate repeatable jobs for schedule: ${schedule.id}`);
+        await this.register(schedule);
       }
     }
     for (const scheduleId of bullmqScheduleIds) {
@@ -167,7 +195,10 @@ class BullMQSchedulerService {
       tz: schedule.timezone || "UTC"
     };
     if (schedule.scheduleType === "cron") {
-      parseCronExpression(schedule.scheduleValue, schedule.timezone || "UTC");
+      const parsedCron = parseCronExpression(schedule.scheduleValue, schedule.timezone || "UTC");
+      if (!parsedCron.isValid) {
+        throw new Error(parsedCron.error || "Invalid cron expression");
+      }
       opts.pattern = schedule.scheduleValue;
     } else if (schedule.scheduleType === "interval") {
       const intervalMs = parseInterval(schedule.scheduleValue);

package/dist/modules/scheduler/services/bullmqSchedulerService.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/scheduler/services/bullmqSchedulerService.ts"],
-  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/core'\nimport { ScheduledJob } from '../data/entities.js'\nimport { recalculateNextRun } from '../lib/nextRunCalculator'\nimport { parseCronExpression } from '../lib/cronParser'\nimport { parseInterval } from '../lib/intervalParser'\nimport { getRedisUrlOrThrow } from '@open-mercato/shared/lib/redis/connection'\n\ninterface BullRepeatableJob {\n  key: string\n  name: string\n  id?: string | null\n}\n\ninterface BullRepeatOptions {\n  tz?: string\n  pattern?: string\n  every?: number\n}\n\ninterface BullQueue {\n  add(name: string, data: unknown, opts?: unknown): Promise<unknown>\n  getRepeatableJobs?(): Promise<BullRepeatableJob[]>\n  removeRepeatableByKey?(key: string): Promise<boolean>\n  close(): Promise<void>\n}\n\n/**\n * Production scheduler using BullMQ repeatable jobs.\n * \n * Requires Redis. Set QUEUE_STRATEGY=async to use this service.\n * \n * This service syncs database schedules with BullMQ's repeat mechanism.\n * When a schedule is created/updated/deleted in the database, this service\n * adds/updates/removes the corresponding BullMQ repeatable job.\n * \n * BullMQ handles:\n * - Exact timing based on cron expressions or intervals\n * - Distributed locking across multiple instances\n * - Automatic retries if worker fails\n * \n * The worker loads fresh schedule config from DB on each execution,\n * so updates to schedules take effect immediately.\n */\nexport class BullMQSchedulerService {\n  private queue: BullQueue | null = null\n  \n  constructor(\n    private em: () => EntityManager,\n  ) {}\n\n  /**\n   * Lazy-load and return the BullMQ queue instance\n   */\n  private async getQueue(): Promise<BullQueue> {\n    if (!this.queue) {\n      try {\n        const { Queue } = await import('bullmq')\n        this.queue = new Queue('scheduler-execution', { connection: { url: getRedisUrlOrThrow('QUEUE') } })\n      } catch {\n        throw new Error('BullMQ is required for async scheduler. Install it with: npm install bullmq')\n      }\n    }\n    return this.queue\n  }\n\n  /**\n   * Register a schedule with BullMQ repeatable jobs\n   * @param schedule - The schedule to register\n   * @param options - Optional configuration\n   * @param options.skipNextRunUpdate - If true, skip updating nextRunAt (used when called from hooks)\n   */\n  async register(schedule: ScheduledJob, options: { skipNextRunUpdate?: boolean } = {}): Promise<void> {\n    if (!schedule.isEnabled) {\n      console.debug(`[scheduler:bullmq] Skipping disabled schedule: ${schedule.id}`)\n      return\n    }\n\n    try {\n      // Calculate and update next run time (unless skipped)\n      if (!options.skipNextRunUpdate) {\n        const nextRun = recalculateNextRun(\n          schedule.scheduleType,\n          schedule.scheduleValue,\n          schedule.timezone\n        )\n        \n        if (nextRun) {\n          schedule.nextRunAt = nextRun\n          // Flush will be handled by the caller\n        }\n      }\n\n      // Build BullMQ repeat options based on schedule type\n      const repeatOpts = this.buildRepeatOptions(schedule)\n\n      // Add repeatable job to BullMQ\n      // IMPORTANT: Wrap in QueuedJob format to match queue strategy expectations\n      // BullMQ will store this in job.data, and the async strategy worker expects\n      // job.data to be a QueuedJob with id, payload, and createdAt\n      const queue = await this.getQueue()\n      const jobName = `schedule-${schedule.id}`\n      \n      // For repeatable jobs, we need to provide a stable ID in the data\n      // that will be used for each repeat instance\n      // CRITICAL: Include scope information (tenantId, organizationId, scopeType)\n      // for proper multi-tenant isolation and auditing\n      const jobData = {\n        id: jobName,\n        payload: { \n          scheduleId: schedule.id,\n          tenantId: schedule.tenantId,\n          organizationId: schedule.organizationId,\n          scopeType: schedule.scopeType,\n        },\n        createdAt: new Date().toISOString(),\n      }\n      \n      console.debug(`[scheduler:bullmq] Adding repeatable job with data:`, {\n        jobName,\n        scheduleId: schedule.id,\n        scopeType: schedule.scopeType,\n        tenantId: schedule.tenantId,\n        organizationId: schedule.organizationId,\n        repeatOpts,\n        jobData,\n      })\n      \n      await queue.add(\n        jobName, // Job name - used as part of repeatable job key\n        jobData, // Job data in QueuedJob format\n        {\n          repeat: repeatOpts,\n          // Don't set jobId for repeatable jobs - BullMQ generates unique IDs for each instance\n          removeOnComplete: {\n            age: 86400 * 30, // Keep completed jobs for 30 days (execution history)\n            count: 1000,     // Keep last 1000 completed jobs\n          },\n          removeOnFail: {\n            age: 86400 * 90, // Keep failed jobs for 90 days (debugging/audit)\n            count: 5000,     // Keep last 5000 failed jobs\n          },\n        }\n      )\n\n      console.debug(`[scheduler:bullmq] Registered schedule: ${schedule.name} (${schedule.id})`, {\n        type: schedule.scheduleType,\n        pattern: schedule.scheduleValue,\n        timezone: schedule.timezone,\n      })\n    } catch (error: unknown) {\n      console.error(`[scheduler:bullmq] Failed to register schedule: ${schedule.id}`, error)\n      throw error\n    }\n  }\n\n  /**\n   * Unregister a schedule from BullMQ repeatable jobs\n   */\n  async unregister(scheduleId: string): Promise<void> {\n    try {\n      const queue = await this.getQueue()\n      \n      // Remove repeatable job by key\n      const repeatableJobs = await queue.getRepeatableJobs?.()\n      \n      if (repeatableJobs) {\n        for (const job of repeatableJobs) {\n          if (job.id === `schedule-${scheduleId}` || job.name === `schedule-${scheduleId}`) {\n            await queue.removeRepeatableByKey?.(job.key)\n            console.debug(`[scheduler:bullmq] Unregistered schedule: ${scheduleId}`)\n            return\n          }\n        }\n      }\n\n      console.debug(`[scheduler:bullmq] No repeatable job found for schedule: ${scheduleId}`)\n    } catch (error: unknown) {\n      console.error(`[scheduler:bullmq] Failed to unregister schedule: ${scheduleId}`, error)\n      throw error\n    }\n  }\n\n  /**\n   * Sync all enabled schedules with BullMQ\n   * Useful for initialization or repair\n   */\n  async syncAll(): Promise<void> {\n    const em = this.em().fork()\n    const queue = await this.getQueue()\n    \n    console.debug('[scheduler:bullmq] Starting full sync...')\n\n    // Get all BullMQ repeatable jobs\n    const repeatableJobs = await queue.getRepeatableJobs?.() || []\n    const bullmqScheduleIds = new Set<string>(\n      repeatableJobs\n        .filter((j) => j.id?.startsWith('schedule-') || j.name?.startsWith('schedule-'))\n        .map((j) => String(j.id || j.name).replace('schedule-', ''))\n    )\n\n    // Get enabled schedules from database in batches to avoid unbounded loads\n    const BATCH_SIZE = 500\n    const dbSchedules: ScheduledJob[] = []\n    let offset = 0\n    let batch: ScheduledJob[]\n    do {\n      batch = await em.find(ScheduledJob, {\n        isEnabled: true,\n        deletedAt: null,\n      }, { limit: BATCH_SIZE, offset })\n      dbSchedules.push(...batch)\n      offset += BATCH_SIZE\n    } while (batch.length === BATCH_SIZE)\n\n    const dbScheduleIds = new Set(dbSchedules.map(s => s.id))\n\n    // Register schedules that exist in DB but not in BullMQ\n    for (const schedule of dbSchedules) {\n      if (!bullmqScheduleIds.has(schedule.id)) {\n        console.debug(`[scheduler:bullmq] Registering missing schedule: ${schedule.name}`)\n        await this.register(schedule)\n      }\n    }\n\n    // Remove BullMQ jobs that don't exist in DB or are disabled\n    for (const scheduleId of bullmqScheduleIds) {\n      if (!dbScheduleIds.has(scheduleId)) {\n        console.log(`[scheduler:bullmq] Removing orphaned schedule: ${scheduleId}`)\n        await this.unregister(String(scheduleId))\n      }\n    }\n\n    console.debug(`[scheduler:bullmq] Sync complete - ${dbSchedules.length} schedules active`)\n  }\n\n  /**\n   * Build BullMQ repeat options from schedule configuration\n   */\n  private buildRepeatOptions(schedule: ScheduledJob): BullRepeatOptions {\n    const opts: BullRepeatOptions = {\n      tz: schedule.timezone || 'UTC',\n    }\n\n    if (schedule.scheduleType === 'cron') {\n      // Validate cron expression\n      parseCronExpression(schedule.scheduleValue, schedule.timezone || 'UTC')\n      opts.pattern = schedule.scheduleValue\n    } else if (schedule.scheduleType === 'interval') {\n      // Parse interval (e.g., \"15m\", \"2h\", \"1d\")\n      const intervalMs = parseInterval(schedule.scheduleValue)\n      opts.every = intervalMs\n    } else {\n      throw new Error(`Unsupported schedule type: ${schedule.scheduleType}`)\n    }\n\n    return opts\n  }\n\n  /**\n   * Get list of all repeatable jobs from BullMQ\n   */\n  async getRepeatableJobs(): Promise<unknown[]> {\n    try {\n      const queue = await this.getQueue()\n      return await queue.getRepeatableJobs?.() || []\n    } catch (error) {\n      console.error('[scheduler:bullmq] Failed to get repeatable jobs:', error)\n      return []\n    }\n  }\n\n  /**\n   * Close the cached BullMQ queue connection.\n   * Must be called during graceful shutdown to prevent Redis connection leaks.\n   */\n  async destroy(): Promise<void> {\n    if (this.queue) {\n      try {\n        await this.queue.close()\n        this.queue = null\n        console.debug('[scheduler:bullmq] Queue connection closed')\n      } catch (error) {\n        console.error('[scheduler:bullmq] Error closing queue:', error)\n      }\n    }\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/core'\nimport { ScheduledJob } from '../data/entities.js'\nimport { recalculateNextRun } from '../lib/nextRunCalculator'\nimport { parseCronExpression } from '../lib/cronParser'\nimport { parseInterval } from '../lib/intervalParser'\nimport { getRedisUrlOrThrow } from '@open-mercato/shared/lib/redis/connection'\n\ninterface BullRepeatableJob {\n  key: string\n  name: string\n  id?: string | null\n}\n\ninterface BullRepeatOptions {\n  tz?: string\n  pattern?: string\n  every?: number\n}\n\ninterface BullQueue {\n  add(name: string, data: unknown, opts?: unknown): Promise<unknown>\n  getRepeatableJobs?(): Promise<BullRepeatableJob[]>\n  removeRepeatableByKey?(key: string): Promise<boolean>\n  close(): Promise<void>\n}\n\n/**\n * Production scheduler using BullMQ repeatable jobs.\n * \n * Requires Redis. Set QUEUE_STRATEGY=async to use this service.\n * \n * This service syncs database schedules with BullMQ's repeat mechanism.\n * When a schedule is created/updated/deleted in the database, this service\n * adds/updates/removes the corresponding BullMQ repeatable job.\n * \n * BullMQ handles:\n * - Exact timing based on cron expressions or intervals\n * - Distributed locking across multiple instances\n * - Automatic retries if worker fails\n * \n * The worker loads fresh schedule config from DB on each execution,\n * so updates to schedules take effect immediately.\n */\nexport class BullMQSchedulerService {\n  private queue: BullQueue | null = null\n  \n  constructor(\n    private em: () => EntityManager,\n  ) {}\n\n  /**\n   * Lazy-load and return the BullMQ queue instance\n   */\n  private async getQueue(): Promise<BullQueue> {\n    if (!this.queue) {\n      try {\n        const { Queue } = await import('bullmq')\n        this.queue = new Queue('scheduler-execution', { connection: { url: getRedisUrlOrThrow('QUEUE') } })\n      } catch {\n        throw new Error('BullMQ is required for async scheduler. Install it with: npm install bullmq')\n      }\n    }\n    return this.queue\n  }\n\n  private getScheduleJobName(scheduleId: string): string {\n    return `schedule-${scheduleId}`\n  }\n\n  private getScheduleIdFromRepeatableJob(job: BullRepeatableJob): string | null {\n    const candidate = job.id?.startsWith('schedule-')\n      ? job.id\n      : job.name?.startsWith('schedule-')\n        ? job.name\n        : null\n\n    return candidate ? candidate.slice('schedule-'.length) : null\n  }\n\n  private isRepeatableJobForSchedule(job: BullRepeatableJob, scheduleId: string): boolean {\n    const jobName = this.getScheduleJobName(scheduleId)\n    return job.id === jobName || job.name === jobName\n  }\n\n  private async removeRepeatableJobsForSchedule(queue: BullQueue, scheduleId: string): Promise<number> {\n    const repeatableJobs = await queue.getRepeatableJobs?.()\n    if (!repeatableJobs || typeof queue.removeRepeatableByKey !== 'function') {\n      return 0\n    }\n\n    let removed = 0\n    for (const job of repeatableJobs) {\n      if (!this.isRepeatableJobForSchedule(job, scheduleId)) continue\n      await queue.removeRepeatableByKey(job.key)\n      removed += 1\n    }\n\n    return removed\n  }\n\n  /**\n   * Register a schedule with BullMQ repeatable jobs\n   * @param schedule - The schedule to register\n   * @param options - Optional configuration\n   * @param options.skipNextRunUpdate - If true, skip updating nextRunAt (used when called from hooks)\n   */\n  async register(schedule: ScheduledJob, options: { skipNextRunUpdate?: boolean } = {}): Promise<void> {\n    if (!schedule.isEnabled) {\n      console.debug(`[scheduler:bullmq] Skipping disabled schedule: ${schedule.id}`)\n      return\n    }\n\n    try {\n      // Calculate and update next run time (unless skipped)\n      if (!options.skipNextRunUpdate) {\n        const nextRun = recalculateNextRun(\n          schedule.scheduleType,\n          schedule.scheduleValue,\n          schedule.timezone\n        )\n        \n        if (nextRun) {\n          schedule.nextRunAt = nextRun\n          // Flush will be handled by the caller\n        }\n      }\n\n      // Build BullMQ repeat options based on schedule type\n      const repeatOpts = this.buildRepeatOptions(schedule)\n\n      // Add repeatable job to BullMQ\n      // IMPORTANT: Wrap in QueuedJob format to match queue strategy expectations\n      // BullMQ will store this in job.data, and the async strategy worker expects\n      // job.data to be a QueuedJob with id, payload, and createdAt\n      const queue = await this.getQueue()\n      const jobName = this.getScheduleJobName(schedule.id)\n      await this.removeRepeatableJobsForSchedule(queue, schedule.id)\n      \n      // For repeatable jobs, we need to provide a stable ID in the data\n      // that will be used for each repeat instance\n      // CRITICAL: Include scope information (tenantId, organizationId, scopeType)\n      // for proper multi-tenant isolation and auditing\n      const jobData = {\n        id: jobName,\n        payload: { \n          scheduleId: schedule.id,\n          tenantId: schedule.tenantId,\n          organizationId: schedule.organizationId,\n          scopeType: schedule.scopeType,\n        },\n        createdAt: new Date().toISOString(),\n      }\n      \n      console.debug(`[scheduler:bullmq] Adding repeatable job with data:`, {\n        jobName,\n        scheduleId: schedule.id,\n        scopeType: schedule.scopeType,\n        tenantId: schedule.tenantId,\n        organizationId: schedule.organizationId,\n        repeatOpts,\n        jobData,\n      })\n      \n      await queue.add(\n        jobName, // Job name - used as part of repeatable job key\n        jobData, // Job data in QueuedJob format\n        {\n          repeat: repeatOpts,\n          // Don't set jobId for repeatable jobs - BullMQ generates unique IDs for each instance\n          removeOnComplete: {\n            age: 86400 * 30, // Keep completed jobs for 30 days (execution history)\n            count: 1000,     // Keep last 1000 completed jobs\n          },\n          removeOnFail: {\n            age: 86400 * 90, // Keep failed jobs for 90 days (debugging/audit)\n            count: 5000,     // Keep last 5000 failed jobs\n          },\n        }\n      )\n\n      console.debug(`[scheduler:bullmq] Registered schedule: ${schedule.name} (${schedule.id})`, {\n        type: schedule.scheduleType,\n        pattern: schedule.scheduleValue,\n        timezone: schedule.timezone,\n      })\n    } catch (error: unknown) {\n      console.error(`[scheduler:bullmq] Failed to register schedule: ${schedule.id}`, error)\n      throw error\n    }\n  }\n\n  /**\n   * Unregister a schedule from BullMQ repeatable jobs\n   */\n  async unregister(scheduleId: string): Promise<void> {\n    try {\n      const queue = await this.getQueue()\n\n      const removed = await this.removeRepeatableJobsForSchedule(queue, scheduleId)\n      if (removed > 0) {\n        console.debug(`[scheduler:bullmq] Unregistered schedule: ${scheduleId}`)\n      } else {\n        console.debug(`[scheduler:bullmq] No repeatable job found for schedule: ${scheduleId}`)\n      }\n    } catch (error: unknown) {\n      console.error(`[scheduler:bullmq] Failed to unregister schedule: ${scheduleId}`, error)\n      throw error\n    }\n  }\n\n  /**\n   * Sync all enabled schedules with BullMQ\n   * Useful for initialization or repair\n   */\n  async syncAll(): Promise<void> {\n    const em = this.em().fork()\n    const queue = await this.getQueue()\n    \n    console.debug('[scheduler:bullmq] Starting full sync...')\n\n    // Get all BullMQ repeatable jobs\n    const repeatableJobs = await queue.getRepeatableJobs?.() || []\n    const bullmqScheduleIds = new Set<string>()\n    const bullmqScheduleCounts = new Map<string, number>()\n    for (const job of repeatableJobs) {\n      const scheduleId = this.getScheduleIdFromRepeatableJob(job)\n      if (!scheduleId) continue\n      bullmqScheduleIds.add(scheduleId)\n      bullmqScheduleCounts.set(scheduleId, (bullmqScheduleCounts.get(scheduleId) ?? 0) + 1)\n    }\n\n    // Get enabled schedules from database in batches to avoid unbounded loads\n    const BATCH_SIZE = 500\n    const dbSchedules: ScheduledJob[] = []\n    let offset = 0\n    let batch: ScheduledJob[]\n    do {\n      batch = await em.find(ScheduledJob, {\n        isEnabled: true,\n        deletedAt: null,\n      }, { limit: BATCH_SIZE, offset })\n      dbSchedules.push(...batch)\n      offset += BATCH_SIZE\n    } while (batch.length === BATCH_SIZE)\n\n    const dbScheduleIds = new Set(dbSchedules.map(s => s.id))\n\n    // Register schedules that exist in DB but not in BullMQ\n    for (const schedule of dbSchedules) {\n      if (!bullmqScheduleIds.has(schedule.id)) {\n        console.debug(`[scheduler:bullmq] Registering missing schedule: ${schedule.name}`)\n        await this.register(schedule)\n      } else if ((bullmqScheduleCounts.get(schedule.id) ?? 0) > 1) {\n        console.log(`[scheduler:bullmq] Repairing duplicate repeatable jobs for schedule: ${schedule.id}`)\n        await this.register(schedule)\n      }\n    }\n\n    // Remove BullMQ jobs that don't exist in DB or are disabled\n    for (const scheduleId of bullmqScheduleIds) {\n      if (!dbScheduleIds.has(scheduleId)) {\n        console.log(`[scheduler:bullmq] Removing orphaned schedule: ${scheduleId}`)\n        await this.unregister(String(scheduleId))\n      }\n    }\n\n    console.debug(`[scheduler:bullmq] Sync complete - ${dbSchedules.length} schedules active`)\n  }\n\n  /**\n   * Build BullMQ repeat options from schedule configuration\n   */\n  private buildRepeatOptions(schedule: ScheduledJob): BullRepeatOptions {\n    const opts: BullRepeatOptions = {\n      tz: schedule.timezone || 'UTC',\n    }\n\n    if (schedule.scheduleType === 'cron') {\n      // Validate cron expression\n      const parsedCron = parseCronExpression(schedule.scheduleValue, schedule.timezone || 'UTC')\n      if (!parsedCron.isValid) {\n        throw new Error(parsedCron.error || 'Invalid cron expression')\n      }\n      opts.pattern = schedule.scheduleValue\n    } else if (schedule.scheduleType === 'interval') {\n      // Parse interval (e.g., \"15m\", \"2h\", \"1d\")\n      const intervalMs = parseInterval(schedule.scheduleValue)\n      opts.every = intervalMs\n    } else {\n      throw new Error(`Unsupported schedule type: ${schedule.scheduleType}`)\n    }\n\n    return opts\n  }\n\n  /**\n   * Get list of all repeatable jobs from BullMQ\n   */\n  async getRepeatableJobs(): Promise<unknown[]> {\n    try {\n      const queue = await this.getQueue()\n      return await queue.getRepeatableJobs?.() || []\n    } catch (error) {\n      console.error('[scheduler:bullmq] Failed to get repeatable jobs:', error)\n      return []\n    }\n  }\n\n  /**\n   * Close the cached BullMQ queue connection.\n   * Must be called during graceful shutdown to prevent Redis connection leaks.\n   */\n  async destroy(): Promise<void> {\n    if (this.queue) {\n      try {\n        await this.queue.close()\n        this.queue = null\n        console.debug('[scheduler:bullmq] Queue connection closed')\n      } catch (error) {\n        console.error('[scheduler:bullmq] Error closing queue:', error)\n      }\n    }\n  }\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/scheduler",
-  "version": "0.6.6-develop.6353.1.efc82affea",
+  "version": "0.6.6-develop.6356.1.4d780a65a3",
   "license": "MIT",
   "description": "Database-managed scheduled jobs with admin UI",
   "type": "module",
@@ -59,13 +59,13 @@
     "./*/*/*/*/*/*.json": "./src/*/*/*/*/*/*.json"
   },
   "dependencies": {
-    "@open-mercato/events": "0.6.6-develop.6353.1.efc82affea",
-    "@open-mercato/queue": "0.6.6-develop.6353.1.efc82affea",
+    "@open-mercato/events": "0.6.6-develop.6356.1.4d780a65a3",
+    "@open-mercato/queue": "0.6.6-develop.6356.1.4d780a65a3",
     "cron-parser": "^5.6.0"
   },
   "peerDependencies": {
     "@mikro-orm/core": "^7.0.14",
-    "@open-mercato/shared": "0.6.6-develop.6353.1.efc82affea",
+    "@open-mercato/shared": "0.6.6-develop.6356.1.4d780a65a3",
     "bullmq": "^5.0.0",
     "ioredis": "^5.0.0",
     "zod": ">=3.23.0"
@@ -79,7 +79,7 @@
     }
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.6.6-develop.6353.1.efc82affea",
+    "@open-mercato/shared": "0.6.6-develop.6356.1.4d780a65a3",
     "@types/jest": "^30.0.0",
     "@types/node": "^26.0.0",
     "jest": "^30.4.2",

package/src/modules/scheduler/services/__tests__/bullmqSchedulerService.test.ts

@@ -27,6 +27,9 @@ describe('BullMQSchedulerService', () => {
 
   beforeEach(() => {
     jest.clearAllMocks()
+    mockQueue.add.mockResolvedValue({})
+    mockQueue.getRepeatableJobs.mockResolvedValue([])
+    mockQueue.removeRepeatableByKey.mockResolvedValue(true)
 
     // Create mock forked EM
     mockForkedEm = {
@@ -170,6 +173,44 @@ describe('BullMQSchedulerService', () => {
       )
     })
 
+    it('should remove stale repeatable jobs before registering an updated schedule', async () => {
+      const schedule = {
+        id: 'test-1',
+        name: 'Test',
+        isEnabled: true,
+        scheduleType: 'cron',
+        scheduleValue: '*/15 * * * *',
+        timezone: 'UTC',
+        scopeType: 'system',
+      } as ScheduledJob
+
+      mockQueue.getRepeatableJobs.mockResolvedValue([
+        { id: 'schedule-test-1', name: 'schedule-test-1', key: 'old-cron-key' },
+        { id: 'schedule-test-1', name: 'schedule-test-1', key: 'older-cron-key' },
+        { id: 'schedule-other', name: 'schedule-other', key: 'other-key' },
+      ])
+      mockQueue.removeRepeatableByKey.mockResolvedValue(true)
+      mockQueue.add.mockResolvedValue({})
+
+      await service.register(schedule)
+
+      expect(mockQueue.removeRepeatableByKey).toHaveBeenCalledTimes(2)
+      expect(mockQueue.removeRepeatableByKey).toHaveBeenNthCalledWith(1, 'old-cron-key')
+      expect(mockQueue.removeRepeatableByKey).toHaveBeenNthCalledWith(2, 'older-cron-key')
+      expect(mockQueue.add).toHaveBeenCalledWith(
+        'schedule-test-1',
+        expect.any(Object),
+        expect.objectContaining({
+          repeat: expect.objectContaining({
+            pattern: '*/15 * * * *',
+          }),
+        }),
+      )
+      expect(mockQueue.removeRepeatableByKey.mock.invocationCallOrder[1]).toBeLessThan(
+        mockQueue.add.mock.invocationCallOrder[0],
+      )
+    })
+
     it('should update nextRunAt when skipNextRunUpdate is false', async () => {
       const schedule = {
         id: 'test-1',
@@ -287,6 +328,23 @@ describe('BullMQSchedulerService', () => {
       consoleDebugSpy.mockRestore()
     })
 
+    it('should remove all repeatable jobs for the same schedule id', async () => {
+      mockQueue.getRepeatableJobs.mockResolvedValue([
+        { id: 'schedule-test-1', name: 'schedule-test-1', key: 'key-1' },
+        { id: 'schedule-test-1', name: 'schedule-test-1', key: 'key-2' },
+        { name: 'schedule-test-1', key: 'key-3' },
+        { id: 'schedule-other', name: 'schedule-other', key: 'other-key' },
+      ])
+      mockQueue.removeRepeatableByKey.mockResolvedValue(true)
+
+      await service.unregister('test-1')
+
+      expect(mockQueue.removeRepeatableByKey).toHaveBeenCalledTimes(3)
+      expect(mockQueue.removeRepeatableByKey).toHaveBeenNthCalledWith(1, 'key-1')
+      expect(mockQueue.removeRepeatableByKey).toHaveBeenNthCalledWith(2, 'key-2')
+      expect(mockQueue.removeRepeatableByKey).toHaveBeenNthCalledWith(3, 'key-3')
+    })
+
     it('should handle schedule not found', async () => {
       mockQueue.getRepeatableJobs.mockResolvedValue([
         { id: 'schedule-other', name: 'schedule-other', key: 'key-1' },
@@ -389,6 +447,38 @@ describe('BullMQSchedulerService', () => {
       consoleLogSpy.mockRestore()
     })
 
+    it('should repair duplicate repeatable jobs for existing schedules', async () => {
+      const dbSchedules = [
+        { id: 'schedule-1', name: 'Schedule 1', isEnabled: true, scheduleType: 'cron', scheduleValue: '0 0 * * *', timezone: 'UTC', scopeType: 'system' },
+      ] as ScheduledJob[]
+
+      mockForkedEm.find.mockResolvedValue(dbSchedules)
+      mockQueue.getRepeatableJobs.mockResolvedValue([
+        { id: 'schedule-schedule-1', name: 'schedule-schedule-1', key: 'old-key-1' },
+        { id: 'schedule-schedule-1', name: 'schedule-schedule-1', key: 'old-key-2' },
+      ])
+      mockQueue.removeRepeatableByKey.mockResolvedValue(true)
+      mockQueue.add.mockResolvedValue({})
+
+      const consoleLogSpy = jest.spyOn(console, 'log').mockImplementation()
+
+      await service.syncAll()
+
+      expect(consoleLogSpy).toHaveBeenCalledWith(
+        '[scheduler:bullmq] Repairing duplicate repeatable jobs for schedule: schedule-1'
+      )
+      expect(mockQueue.removeRepeatableByKey).toHaveBeenCalledTimes(2)
+      expect(mockQueue.removeRepeatableByKey).toHaveBeenNthCalledWith(1, 'old-key-1')
+      expect(mockQueue.removeRepeatableByKey).toHaveBeenNthCalledWith(2, 'old-key-2')
+      expect(mockQueue.add).toHaveBeenCalledWith(
+        'schedule-schedule-1',
+        expect.any(Object),
+        expect.any(Object),
+      )
+
+      consoleLogSpy.mockRestore()
+    })
+
     it('should log sync completion', async () => {
       mockForkedEm.find.mockResolvedValue([])
       mockQueue.getRepeatableJobs.mockResolvedValue([])

package/src/modules/scheduler/services/bullmqSchedulerService.ts

@@ -63,6 +63,41 @@ export class BullMQSchedulerService {
     return this.queue
   }
 
+  private getScheduleJobName(scheduleId: string): string {
+    return `schedule-${scheduleId}`
+  }
+
+  private getScheduleIdFromRepeatableJob(job: BullRepeatableJob): string | null {
+    const candidate = job.id?.startsWith('schedule-')
+      ? job.id
+      : job.name?.startsWith('schedule-')
+        ? job.name
+        : null
+
+    return candidate ? candidate.slice('schedule-'.length) : null
+  }
+
+  private isRepeatableJobForSchedule(job: BullRepeatableJob, scheduleId: string): boolean {
+    const jobName = this.getScheduleJobName(scheduleId)
+    return job.id === jobName || job.name === jobName
+  }
+
+  private async removeRepeatableJobsForSchedule(queue: BullQueue, scheduleId: string): Promise<number> {
+    const repeatableJobs = await queue.getRepeatableJobs?.()
+    if (!repeatableJobs || typeof queue.removeRepeatableByKey !== 'function') {
+      return 0
+    }
+
+    let removed = 0
+    for (const job of repeatableJobs) {
+      if (!this.isRepeatableJobForSchedule(job, scheduleId)) continue
+      await queue.removeRepeatableByKey(job.key)
+      removed += 1
+    }
+
+    return removed
+  }
+
   /**
    * Register a schedule with BullMQ repeatable jobs
    * @param schedule - The schedule to register
@@ -98,7 +133,8 @@ export class BullMQSchedulerService {
       // BullMQ will store this in job.data, and the async strategy worker expects
       // job.data to be a QueuedJob with id, payload, and createdAt
       const queue = await this.getQueue()
-      const jobName = `schedule-${schedule.id}`
+      const jobName = this.getScheduleJobName(schedule.id)
+      await this.removeRepeatableJobsForSchedule(queue, schedule.id)
       
       // For repeatable jobs, we need to provide a stable ID in the data
       // that will be used for each repeat instance
@@ -159,21 +195,13 @@ export class BullMQSchedulerService {
   async unregister(scheduleId: string): Promise<void> {
     try {
       const queue = await this.getQueue()
-      
-      // Remove repeatable job by key
-      const repeatableJobs = await queue.getRepeatableJobs?.()
-      
-      if (repeatableJobs) {
-        for (const job of repeatableJobs) {
-          if (job.id === `schedule-${scheduleId}` || job.name === `schedule-${scheduleId}`) {
-            await queue.removeRepeatableByKey?.(job.key)
-            console.debug(`[scheduler:bullmq] Unregistered schedule: ${scheduleId}`)
-            return
-          }
-        }
-      }
 
-      console.debug(`[scheduler:bullmq] No repeatable job found for schedule: ${scheduleId}`)
+      const removed = await this.removeRepeatableJobsForSchedule(queue, scheduleId)
+      if (removed > 0) {
+        console.debug(`[scheduler:bullmq] Unregistered schedule: ${scheduleId}`)
+      } else {
+        console.debug(`[scheduler:bullmq] No repeatable job found for schedule: ${scheduleId}`)
+      }
     } catch (error: unknown) {
       console.error(`[scheduler:bullmq] Failed to unregister schedule: ${scheduleId}`, error)
       throw error
@@ -192,11 +220,14 @@ export class BullMQSchedulerService {
 
     // Get all BullMQ repeatable jobs
     const repeatableJobs = await queue.getRepeatableJobs?.() || []
-    const bullmqScheduleIds = new Set<string>(
-      repeatableJobs
-        .filter((j) => j.id?.startsWith('schedule-') || j.name?.startsWith('schedule-'))
-        .map((j) => String(j.id || j.name).replace('schedule-', ''))
-    )
+    const bullmqScheduleIds = new Set<string>()
+    const bullmqScheduleCounts = new Map<string, number>()
+    for (const job of repeatableJobs) {
+      const scheduleId = this.getScheduleIdFromRepeatableJob(job)
+      if (!scheduleId) continue
+      bullmqScheduleIds.add(scheduleId)
+      bullmqScheduleCounts.set(scheduleId, (bullmqScheduleCounts.get(scheduleId) ?? 0) + 1)
+    }
 
     // Get enabled schedules from database in batches to avoid unbounded loads
     const BATCH_SIZE = 500
@@ -219,6 +250,9 @@ export class BullMQSchedulerService {
       if (!bullmqScheduleIds.has(schedule.id)) {
         console.debug(`[scheduler:bullmq] Registering missing schedule: ${schedule.name}`)
         await this.register(schedule)
+      } else if ((bullmqScheduleCounts.get(schedule.id) ?? 0) > 1) {
+        console.log(`[scheduler:bullmq] Repairing duplicate repeatable jobs for schedule: ${schedule.id}`)
+        await this.register(schedule)
       }
     }
 
@@ -243,7 +277,10 @@ export class BullMQSchedulerService {
 
     if (schedule.scheduleType === 'cron') {
       // Validate cron expression
-      parseCronExpression(schedule.scheduleValue, schedule.timezone || 'UTC')
+      const parsedCron = parseCronExpression(schedule.scheduleValue, schedule.timezone || 'UTC')
+      if (!parsedCron.isValid) {
+        throw new Error(parsedCron.error || 'Invalid cron expression')
+      }
       opts.pattern = schedule.scheduleValue
     } else if (schedule.scheduleType === 'interval') {
       // Parse interval (e.g., "15m", "2h", "1d")