@open-mercato/scheduler 0.6.7-develop.6862.1.c11a64ce0a → 0.6.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (67) hide show
  1. package/.turbo/turbo-build.log +1 -1
  2. package/dist/modules/scheduler/__integration__/TC-SCHED-007.spec.js +1 -4
  3. package/dist/modules/scheduler/__integration__/TC-SCHED-007.spec.js.map +2 -2
  4. package/dist/modules/scheduler/api/jobs/[id]/executions/route.js +2 -4
  5. package/dist/modules/scheduler/api/jobs/[id]/executions/route.js.map +2 -2
  6. package/dist/modules/scheduler/api/queue-jobs/[jobId]/route.js +2 -4
  7. package/dist/modules/scheduler/api/queue-jobs/[jobId]/route.js.map +2 -2
  8. package/dist/modules/scheduler/api/targets/route.js +4 -5
  9. package/dist/modules/scheduler/api/targets/route.js.map +2 -2
  10. package/dist/modules/scheduler/commands/jobs.js +14 -33
  11. package/dist/modules/scheduler/commands/jobs.js.map +2 -2
  12. package/dist/modules/scheduler/data/validators.js +1 -27
  13. package/dist/modules/scheduler/data/validators.js.map +2 -2
  14. package/dist/modules/scheduler/i18n/de.json +0 -2
  15. package/dist/modules/scheduler/i18n/en.json +0 -2
  16. package/dist/modules/scheduler/i18n/es.json +0 -2
  17. package/dist/modules/scheduler/i18n/pl.json +0 -2
  18. package/dist/modules/scheduler/lib/intervalParser.js +3 -8
  19. package/dist/modules/scheduler/lib/intervalParser.js.map +2 -2
  20. package/dist/modules/scheduler/lib/localLockStrategy.js +45 -23
  21. package/dist/modules/scheduler/lib/localLockStrategy.js.map +2 -2
  22. package/dist/modules/scheduler/lib/nextRunCalculator.js +1 -8
  23. package/dist/modules/scheduler/lib/nextRunCalculator.js.map +2 -2
  24. package/dist/modules/scheduler/services/bullmqSchedulerService.js +43 -92
  25. package/dist/modules/scheduler/services/bullmqSchedulerService.js.map +2 -2
  26. package/dist/modules/scheduler/services/localSchedulerService.js +3 -9
  27. package/dist/modules/scheduler/services/localSchedulerService.js.map +2 -2
  28. package/dist/modules/scheduler/services/schedulerService.js +11 -23
  29. package/dist/modules/scheduler/services/schedulerService.js.map +2 -2
  30. package/dist/modules/scheduler/workers/execute-schedule.worker.js +0 -9
  31. package/dist/modules/scheduler/workers/execute-schedule.worker.js.map +2 -2
  32. package/package.json +9 -10
  33. package/src/modules/scheduler/__integration__/TC-SCHED-007.spec.ts +4 -6
  34. package/src/modules/scheduler/api/jobs/[id]/executions/route.ts +2 -4
  35. package/src/modules/scheduler/api/queue-jobs/[jobId]/route.ts +2 -4
  36. package/src/modules/scheduler/api/targets/route.ts +7 -7
  37. package/src/modules/scheduler/commands/jobs.ts +15 -40
  38. package/src/modules/scheduler/data/__tests__/validators.test.ts +9 -69
  39. package/src/modules/scheduler/data/validators.ts +1 -30
  40. package/src/modules/scheduler/i18n/de.json +0 -2
  41. package/src/modules/scheduler/i18n/en.json +0 -2
  42. package/src/modules/scheduler/i18n/es.json +0 -2
  43. package/src/modules/scheduler/i18n/pl.json +0 -2
  44. package/src/modules/scheduler/lib/__tests__/intervalParser.test.ts +9 -27
  45. package/src/modules/scheduler/lib/__tests__/localLockStrategy.test.ts +106 -0
  46. package/src/modules/scheduler/lib/__tests__/nextRunCalculator.test.ts +7 -18
  47. package/src/modules/scheduler/lib/intervalParser.ts +3 -8
  48. package/src/modules/scheduler/lib/localLockStrategy.ts +60 -26
  49. package/src/modules/scheduler/lib/nextRunCalculator.ts +1 -14
  50. package/src/modules/scheduler/services/__tests__/bullmqSchedulerService.test.ts +149 -246
  51. package/src/modules/scheduler/services/__tests__/localSchedulerService.test.ts +11 -97
  52. package/src/modules/scheduler/services/__tests__/schedulerService.test.ts +0 -101
  53. package/src/modules/scheduler/services/bullmqSchedulerService.ts +49 -135
  54. package/src/modules/scheduler/services/localSchedulerService.ts +11 -14
  55. package/src/modules/scheduler/services/schedulerService.ts +12 -27
  56. package/src/modules/scheduler/workers/__tests__/execute-schedule.worker.test.ts +0 -12
  57. package/src/modules/scheduler/workers/execute-schedule.worker.ts +0 -15
  58. package/dist/modules/scheduler/i18n/ko.json +0 -157
  59. package/dist/modules/scheduler/lib/activeScheduleLimits.js +0 -44
  60. package/dist/modules/scheduler/lib/activeScheduleLimits.js.map +0 -7
  61. package/dist/modules/scheduler/lib/scheduler-safe-commands.js +0 -73
  62. package/dist/modules/scheduler/lib/scheduler-safe-commands.js.map +0 -7
  63. package/src/modules/scheduler/api/targets/__tests__/route.test.ts +0 -76
  64. package/src/modules/scheduler/commands/__tests__/jobs.active-limit.test.ts +0 -184
  65. package/src/modules/scheduler/i18n/ko.json +0 -157
  66. package/src/modules/scheduler/lib/activeScheduleLimits.ts +0 -48
  67. package/src/modules/scheduler/lib/scheduler-safe-commands.ts +0 -98
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../../src/modules/scheduler/data/validators.ts"],
4
- "sourcesContent": ["import { z } from 'zod'\nimport { validateCron } from '../lib/cronParser'\nimport { validateInterval } from '../lib/intervalParser'\nimport { commandRegistry } from '@open-mercato/shared/lib/commands/registry'\nimport { parseBooleanToken } from '@open-mercato/shared/lib/boolean'\nimport { isSchedulerSafeCommandId } from '../lib/scheduler-safe-commands'\n\n/**\n * Validate that a command exists in the command registry\n */\nfunction validateCommandExists(commandId: string): boolean {\n return commandRegistry.has(commandId)\n}\n\nfunction validateCommandIsSchedulable(commandId: string): boolean {\n return isSchedulerSafeCommandId(commandId)\n}\n\n/**\n * Base schedule fields\n */\nconst scheduleBaseSchema = z.object({\n name: z.string().min(1, 'Name is required').max(200),\n description: z.string().max(500).optional().nullable(),\n \n scopeType: z.enum(['system', 'organization', 'tenant']),\n organizationId: z.uuid().optional().nullable(),\n tenantId: z.uuid().optional().nullable(),\n \n scheduleType: z.enum(['cron', 'interval']),\n scheduleValue: z.string().min(1, 'Schedule value is required'),\n timezone: z.string().default('UTC'),\n \n targetType: z.enum(['queue', 'command']),\n targetQueue: z.string().optional().nullable(),\n targetCommand: z.string().optional().nullable(),\n targetPayload: z.record(z.string(), z.unknown()).optional().nullable(),\n \n requireFeature: z.string().optional().nullable(),\n \n isEnabled: z.boolean().default(true),\n sourceType: z.enum(['user', 'module']).default('user'),\n sourceModule: z.string().optional().nullable(),\n})\n\n/**\n * Create schedule schema\n */\nexport const scheduleCreateSchema = scheduleBaseSchema\n .refine(\n (data) => {\n if (data.scopeType === 'system') {\n return !data.organizationId && !data.tenantId\n }\n if (data.scopeType === 'organization') {\n return !!data.organizationId && !!data.tenantId\n }\n if (data.scopeType === 'tenant') {\n return !data.organizationId && !!data.tenantId\n }\n return false\n },\n {\n message: 'Invalid scope configuration',\n path: ['scopeType'],\n }\n )\n .refine(\n (data) => {\n if (data.targetType === 'queue') {\n return !!data.targetQueue\n }\n if (data.targetType === 'command') {\n return !!data.targetCommand\n }\n return false\n },\n {\n message: 'Target queue or command is required based on target type',\n path: ['targetType'],\n }\n )\n .refine(\n (data) => {\n if (data.scheduleType === 'cron') {\n return validateCron(data.scheduleValue)\n }\n if (data.scheduleType === 'interval') {\n return validateInterval(data.scheduleValue)\n }\n return false\n },\n {\n message: 'Invalid schedule value. For cron: use valid cron expression (e.g., \"0 0 * * *\"). For interval: use <number><unit> format (e.g., \"15m\", \"2h\", \"1d\")',\n path: ['scheduleValue'],\n }\n )\n .refine(\n (data) => {\n // Validate that command exists if targetType is 'command'\n if (data.targetType === 'command' && data.targetCommand) {\n return validateCommandExists(data.targetCommand)\n }\n return true\n },\n {\n message: 'Command does not exist. Please ensure the command is registered before creating a schedule.',\n path: ['targetCommand'],\n }\n )\n .refine(\n (data) => {\n if (data.targetType === 'command' && data.targetCommand) {\n return validateCommandIsSchedulable(data.targetCommand)\n }\n return true\n },\n {\n message: 'Command is not schedulable. Only scheduler-safe commands can be used as schedule targets.',\n path: ['targetCommand'],\n }\n )\n\n/**\n * Update schedule schema (all fields optional except id)\n */\nexport const scheduleUpdateSchema = z.object({\n id: z.uuid(),\n name: z.string().min(1).max(200).optional(),\n description: z.string().max(500).optional().nullable(),\n \n scheduleType: z.enum(['cron', 'interval']).optional(),\n scheduleValue: z.string().min(1).optional(),\n timezone: z.string().optional(),\n \n targetType: z.enum(['queue', 'command']).optional(),\n targetQueue: z.string().optional().nullable(),\n targetCommand: z.string().optional().nullable(),\n targetPayload: z.record(z.string(), z.unknown()).optional().nullable(),\n requireFeature: z.string().optional().nullable(),\n \n isEnabled: z.boolean().optional(),\n})\n .refine(\n (data) => {\n // If scheduleValue is provided, scheduleType must also be provided\n // This ensures we can validate the value against its type\n if (data.scheduleValue !== undefined && data.scheduleType === undefined) {\n return false\n }\n return true\n },\n {\n message: 'scheduleType is required when updating scheduleValue',\n path: ['scheduleType'],\n }\n )\n .refine(\n (data) => {\n // If scheduleValue is provided, validate it based on scheduleType\n if (data.scheduleValue && data.scheduleType) {\n if (data.scheduleType === 'cron') {\n return validateCron(data.scheduleValue)\n }\n if (data.scheduleType === 'interval') {\n return validateInterval(data.scheduleValue)\n }\n }\n return true\n },\n {\n message: 'Invalid schedule value. For cron: use valid cron expression (e.g., \"0 0 * * *\"). For interval: use <number><unit> format (e.g., \"15m\", \"2h\", \"1d\")',\n path: ['scheduleValue'],\n }\n )\n .refine(\n (data) => {\n // If targetType is provided, ensure appropriate target is set\n if (data.targetType === 'queue') {\n return data.targetQueue !== undefined\n }\n if (data.targetType === 'command') {\n return data.targetCommand !== undefined\n }\n return true\n },\n {\n message: 'When changing target type, you must provide the corresponding targetQueue or targetCommand',\n path: ['targetType'],\n }\n )\n .refine(\n (data) => {\n // Validate that command exists if targetCommand is provided\n if (data.targetCommand) {\n return validateCommandExists(data.targetCommand)\n }\n return true\n },\n {\n message: 'Command does not exist. Please ensure the command is registered before updating.',\n path: ['targetCommand'],\n }\n )\n .refine(\n (data) => {\n if (data.targetCommand) {\n return validateCommandIsSchedulable(data.targetCommand)\n }\n return true\n },\n {\n message: 'Command is not schedulable. Only scheduler-safe commands can be used as schedule targets.',\n path: ['targetCommand'],\n }\n )\n\n/**\n * Delete schedule schema\n */\nexport const scheduleDeleteSchema = z.object({\n id: z.uuid(),\n})\n\n/**\n * List schedules query schema\n */\nexport const scheduleListQuerySchema = z.object({\n page: z.coerce.number().int().min(1).default(1),\n pageSize: z.coerce.number().int().min(1).max(100).default(20),\n id: z.string().uuid().optional(),\n search: z.string().optional(),\n scopeType: z.enum(['system', 'organization', 'tenant']).optional(),\n isEnabled: z.string().optional().transform((val) => {\n if (val === undefined) return undefined\n return parseBooleanToken(val) ?? undefined\n }),\n sourceType: z.enum(['user', 'module']).optional(),\n sourceModule: z.string().optional(),\n sort: z.string().optional(),\n order: z.enum(['asc', 'desc']).optional(),\n})\n\n/**\n * Trigger schedule schema (manual execution)\n */\nexport const scheduleTriggerSchema = z.object({\n id: z.uuid(),\n})\n\n/**\n * Get schedule runs query schema\n */\nexport const scheduleRunsQuerySchema = z.object({\n page: z.coerce.number().int().min(1).default(1),\n pageSize: z.coerce.number().int().min(1).max(100).default(20),\n scheduledJobId: z.uuid().optional(),\n status: z.enum(['running', 'completed', 'failed', 'skipped']).optional(),\n triggerType: z.enum(['scheduled', 'manual']).optional(),\n fromDate: z.string().datetime().optional(),\n toDate: z.string().datetime().optional(),\n sort: z.string().optional(),\n order: z.enum(['asc', 'desc']).optional(),\n})\n\n/**\n * Type exports\n */\nexport type ScheduleCreateInput = z.infer<typeof scheduleCreateSchema>\nexport type ScheduleUpdateInput = z.infer<typeof scheduleUpdateSchema>\nexport type ScheduleDeleteInput = z.infer<typeof scheduleDeleteSchema>\nexport type ScheduleListQuery = z.infer<typeof scheduleListQuerySchema>\nexport type ScheduleTriggerInput = z.infer<typeof scheduleTriggerSchema>\nexport type ScheduleRunsQuery = z.infer<typeof scheduleRunsQuerySchema>\n"],
5
- "mappings": "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",
4
+ "sourcesContent": ["import { z } from 'zod'\nimport { validateCron } from '../lib/cronParser'\nimport { validateInterval } from '../lib/intervalParser'\nimport { commandRegistry } from '@open-mercato/shared/lib/commands'\nimport { parseBooleanToken } from '@open-mercato/shared/lib/boolean'\n\n/**\n * Validate that a command exists in the command registry\n */\nfunction validateCommandExists(commandId: string): boolean {\n return commandRegistry.has(commandId)\n}\n\n/**\n * Base schedule fields\n */\nconst scheduleBaseSchema = z.object({\n name: z.string().min(1, 'Name is required').max(200),\n description: z.string().max(500).optional().nullable(),\n \n scopeType: z.enum(['system', 'organization', 'tenant']),\n organizationId: z.uuid().optional().nullable(),\n tenantId: z.uuid().optional().nullable(),\n \n scheduleType: z.enum(['cron', 'interval']),\n scheduleValue: z.string().min(1, 'Schedule value is required'),\n timezone: z.string().default('UTC'),\n \n targetType: z.enum(['queue', 'command']),\n targetQueue: z.string().optional().nullable(),\n targetCommand: z.string().optional().nullable(),\n targetPayload: z.record(z.string(), z.unknown()).optional().nullable(),\n \n requireFeature: z.string().optional().nullable(),\n \n isEnabled: z.boolean().default(true),\n sourceType: z.enum(['user', 'module']).default('user'),\n sourceModule: z.string().optional().nullable(),\n})\n\n/**\n * Create schedule schema\n */\nexport const scheduleCreateSchema = scheduleBaseSchema\n .refine(\n (data) => {\n if (data.scopeType === 'system') {\n return !data.organizationId && !data.tenantId\n }\n if (data.scopeType === 'organization') {\n return !!data.organizationId && !!data.tenantId\n }\n if (data.scopeType === 'tenant') {\n return !data.organizationId && !!data.tenantId\n }\n return false\n },\n {\n message: 'Invalid scope configuration',\n path: ['scopeType'],\n }\n )\n .refine(\n (data) => {\n if (data.targetType === 'queue') {\n return !!data.targetQueue\n }\n if (data.targetType === 'command') {\n return !!data.targetCommand\n }\n return false\n },\n {\n message: 'Target queue or command is required based on target type',\n path: ['targetType'],\n }\n )\n .refine(\n (data) => {\n if (data.scheduleType === 'cron') {\n return validateCron(data.scheduleValue)\n }\n if (data.scheduleType === 'interval') {\n return validateInterval(data.scheduleValue)\n }\n return false\n },\n {\n message: 'Invalid schedule value. For cron: use valid cron expression (e.g., \"0 0 * * *\"). For interval: use <number><unit> format (e.g., \"15m\", \"2h\", \"1d\")',\n path: ['scheduleValue'],\n }\n )\n .refine(\n (data) => {\n // Validate that command exists if targetType is 'command'\n if (data.targetType === 'command' && data.targetCommand) {\n return validateCommandExists(data.targetCommand)\n }\n return true\n },\n {\n message: 'Command does not exist. Please ensure the command is registered before creating a schedule.',\n path: ['targetCommand'],\n }\n )\n\n/**\n * Update schedule schema (all fields optional except id)\n */\nexport const scheduleUpdateSchema = z.object({\n id: z.uuid(),\n name: z.string().min(1).max(200).optional(),\n description: z.string().max(500).optional().nullable(),\n \n scheduleType: z.enum(['cron', 'interval']).optional(),\n scheduleValue: z.string().min(1).optional(),\n timezone: z.string().optional(),\n \n targetType: z.enum(['queue', 'command']).optional(),\n targetQueue: z.string().optional().nullable(),\n targetCommand: z.string().optional().nullable(),\n targetPayload: z.record(z.string(), z.unknown()).optional().nullable(),\n requireFeature: z.string().optional().nullable(),\n \n isEnabled: z.boolean().optional(),\n})\n .refine(\n (data) => {\n // If scheduleValue is provided, scheduleType must also be provided\n // This ensures we can validate the value against its type\n if (data.scheduleValue !== undefined && data.scheduleType === undefined) {\n return false\n }\n return true\n },\n {\n message: 'scheduleType is required when updating scheduleValue',\n path: ['scheduleType'],\n }\n )\n .refine(\n (data) => {\n // If scheduleValue is provided, validate it based on scheduleType\n if (data.scheduleValue && data.scheduleType) {\n if (data.scheduleType === 'cron') {\n return validateCron(data.scheduleValue)\n }\n if (data.scheduleType === 'interval') {\n return validateInterval(data.scheduleValue)\n }\n }\n return true\n },\n {\n message: 'Invalid schedule value. For cron: use valid cron expression (e.g., \"0 0 * * *\"). For interval: use <number><unit> format (e.g., \"15m\", \"2h\", \"1d\")',\n path: ['scheduleValue'],\n }\n )\n .refine(\n (data) => {\n // If targetType is provided, ensure appropriate target is set\n if (data.targetType === 'queue') {\n return data.targetQueue !== undefined\n }\n if (data.targetType === 'command') {\n return data.targetCommand !== undefined\n }\n return true\n },\n {\n message: 'When changing target type, you must provide the corresponding targetQueue or targetCommand',\n path: ['targetType'],\n }\n )\n .refine(\n (data) => {\n // Validate that command exists if targetCommand is provided\n if (data.targetCommand) {\n return validateCommandExists(data.targetCommand)\n }\n return true\n },\n {\n message: 'Command does not exist. Please ensure the command is registered before updating.',\n path: ['targetCommand'],\n }\n )\n\n/**\n * Delete schedule schema\n */\nexport const scheduleDeleteSchema = z.object({\n id: z.uuid(),\n})\n\n/**\n * List schedules query schema\n */\nexport const scheduleListQuerySchema = z.object({\n page: z.coerce.number().int().min(1).default(1),\n pageSize: z.coerce.number().int().min(1).max(100).default(20),\n id: z.string().uuid().optional(),\n search: z.string().optional(),\n scopeType: z.enum(['system', 'organization', 'tenant']).optional(),\n isEnabled: z.string().optional().transform((val) => {\n if (val === undefined) return undefined\n return parseBooleanToken(val) ?? undefined\n }),\n sourceType: z.enum(['user', 'module']).optional(),\n sourceModule: z.string().optional(),\n sort: z.string().optional(),\n order: z.enum(['asc', 'desc']).optional(),\n})\n\n/**\n * Trigger schedule schema (manual execution)\n */\nexport const scheduleTriggerSchema = z.object({\n id: z.uuid(),\n})\n\n/**\n * Get schedule runs query schema\n */\nexport const scheduleRunsQuerySchema = z.object({\n page: z.coerce.number().int().min(1).default(1),\n pageSize: z.coerce.number().int().min(1).max(100).default(20),\n scheduledJobId: z.uuid().optional(),\n status: z.enum(['running', 'completed', 'failed', 'skipped']).optional(),\n triggerType: z.enum(['scheduled', 'manual']).optional(),\n fromDate: z.string().datetime().optional(),\n toDate: z.string().datetime().optional(),\n sort: z.string().optional(),\n order: z.enum(['asc', 'desc']).optional(),\n})\n\n/**\n * Type exports\n */\nexport type ScheduleCreateInput = z.infer<typeof scheduleCreateSchema>\nexport type ScheduleUpdateInput = z.infer<typeof scheduleUpdateSchema>\nexport type ScheduleDeleteInput = z.infer<typeof scheduleDeleteSchema>\nexport type ScheduleListQuery = z.infer<typeof scheduleListQuerySchema>\nexport type ScheduleTriggerInput = z.infer<typeof scheduleTriggerSchema>\nexport type ScheduleRunsQuery = z.infer<typeof scheduleRunsQuerySchema>\n"],
5
+ "mappings": "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",
6
6
  "names": []
7
7
  }
@@ -26,7 +26,6 @@
26
26
  "scheduler.details.triggering": "Wird ausgeführt...",
27
27
  "scheduler.edit.title": "Zeitplan bearbeiten",
28
28
  "scheduler.error.access_denied": "Zugriff verweigert",
29
- "scheduler.error.active_schedule_limit": "Das Limit aktiver geplanter Aufgaben für diesen Mandanten wurde erreicht ({max}).",
30
29
  "scheduler.error.async_strategy_hint": "Bitte setzen Sie QUEUE_STRATEGY=async, um den Ausführungsverlauf einzusehen",
31
30
  "scheduler.error.async_strategy_required": "Ausführungsverlauf erfordert QUEUE_STRATEGY=async",
32
31
  "scheduler.error.bullmq_required": "BullMQ-Job-Logs sind nur mit QUEUE_STRATEGY=async verfügbar",
@@ -37,7 +36,6 @@
37
36
  "scheduler.error.forbidden": "Verboten",
38
37
  "scheduler.error.invalidPayload": "Ungültiges JSON-Payload",
39
38
  "scheduler.error.invalid_queue_name": "Ungültiger Queue-Name",
40
- "scheduler.error.invalid_schedule_value": "Ungültiger Zeitplanwert.",
41
39
  "scheduler.error.job_not_found": "Job in BullMQ nicht gefunden (möglicherweise entfernt)",
42
40
  "scheduler.error.load_failed": "Fehler beim Laden des Zeitplans",
43
41
  "scheduler.error.not_found": "Zeitplan nicht gefunden",
@@ -26,7 +26,6 @@
26
26
  "scheduler.details.triggering": "Triggering...",
27
27
  "scheduler.edit.title": "Edit Schedule",
28
28
  "scheduler.error.access_denied": "Access denied",
29
- "scheduler.error.active_schedule_limit": "Active scheduled job limit reached for this tenant ({max}).",
30
29
  "scheduler.error.async_strategy_hint": "Please set QUEUE_STRATEGY=async to view execution history",
31
30
  "scheduler.error.async_strategy_required": "Execution history requires QUEUE_STRATEGY=async",
32
31
  "scheduler.error.bullmq_required": "BullMQ job logs are only available with QUEUE_STRATEGY=async",
@@ -37,7 +36,6 @@
37
36
  "scheduler.error.forbidden": "Forbidden",
38
37
  "scheduler.error.invalidPayload": "Invalid JSON payload",
39
38
  "scheduler.error.invalid_queue_name": "Invalid queue name",
40
- "scheduler.error.invalid_schedule_value": "Invalid schedule value.",
41
39
  "scheduler.error.job_not_found": "Job not found in BullMQ (may have been removed)",
42
40
  "scheduler.error.load_failed": "Failed to load schedule",
43
41
  "scheduler.error.not_found": "Schedule not found",
@@ -26,7 +26,6 @@
26
26
  "scheduler.details.triggering": "Ejecutando...",
27
27
  "scheduler.edit.title": "Editar programación",
28
28
  "scheduler.error.access_denied": "Acceso denegado",
29
- "scheduler.error.active_schedule_limit": "Se alcanzó el límite de tareas programadas activas para este inquilino ({max}).",
30
29
  "scheduler.error.async_strategy_hint": "Configure QUEUE_STRATEGY=async para ver el historial de ejecución",
31
30
  "scheduler.error.async_strategy_required": "El historial de ejecución requiere QUEUE_STRATEGY=async",
32
31
  "scheduler.error.bullmq_required": "Los registros de trabajos de BullMQ solo están disponibles con QUEUE_STRATEGY=async",
@@ -37,7 +36,6 @@
37
36
  "scheduler.error.forbidden": "Prohibido",
38
37
  "scheduler.error.invalidPayload": "Carga JSON no válida",
39
38
  "scheduler.error.invalid_queue_name": "Nombre de cola inválido",
40
- "scheduler.error.invalid_schedule_value": "Valor de programación no válido.",
41
39
  "scheduler.error.job_not_found": "Trabajo no encontrado en BullMQ (puede haber sido eliminado)",
42
40
  "scheduler.error.load_failed": "Error al cargar la programación",
43
41
  "scheduler.error.not_found": "Programación no encontrada",
@@ -26,7 +26,6 @@
26
26
  "scheduler.details.triggering": "Uruchamianie...",
27
27
  "scheduler.edit.title": "Edytuj harmonogram",
28
28
  "scheduler.error.access_denied": "Odmowa dostępu",
29
- "scheduler.error.active_schedule_limit": "Osiągnięto limit aktywnych zaplanowanych zadań dla tego najemcy ({max}).",
30
29
  "scheduler.error.async_strategy_hint": "Ustaw QUEUE_STRATEGY=async, aby wyświetlić historię wykonań",
31
30
  "scheduler.error.async_strategy_required": "Historia wykonań wymaga QUEUE_STRATEGY=async",
32
31
  "scheduler.error.bullmq_required": "Logi zadań BullMQ są dostępne tylko z QUEUE_STRATEGY=async",
@@ -37,7 +36,6 @@
37
36
  "scheduler.error.forbidden": "Zabronione",
38
37
  "scheduler.error.invalidPayload": "Nieprawidłowy ładunek JSON",
39
38
  "scheduler.error.invalid_queue_name": "Nieprawidłowa nazwa kolejki",
40
- "scheduler.error.invalid_schedule_value": "Nieprawidłowa wartość harmonogramu.",
41
39
  "scheduler.error.job_not_found": "Zadanie nie zostało znalezione w BullMQ (mogło zostać usunięte)",
42
40
  "scheduler.error.load_failed": "Nie udało się załadować harmonogramu",
43
41
  "scheduler.error.not_found": "Harmonogram nie znaleziony",
@@ -1,4 +1,3 @@
1
- const MIN_SCHEDULE_INTERVAL_MS = 60 * 1e3;
2
1
  function parseInterval(interval) {
3
2
  const regex = /^(\d+)(s|m|h|d)$/;
4
3
  const match = interval.match(regex);
@@ -19,16 +18,14 @@ function parseInterval(interval) {
19
18
  };
20
19
  return value * multipliers[unit];
21
20
  }
22
- function resolveScheduleIntervalMs(interval) {
23
- return Math.max(parseInterval(interval), MIN_SCHEDULE_INTERVAL_MS);
24
- }
25
21
  function calculateNextRunFromInterval(interval, fromDate = /* @__PURE__ */ new Date()) {
26
- const ms = resolveScheduleIntervalMs(interval);
22
+ const ms = parseInterval(interval);
27
23
  return new Date(fromDate.getTime() + ms);
28
24
  }
29
25
  function validateInterval(interval) {
30
26
  try {
31
- return parseInterval(interval) >= MIN_SCHEDULE_INTERVAL_MS;
27
+ parseInterval(interval);
28
+ return true;
32
29
  } catch {
33
30
  return false;
34
31
  }
@@ -75,11 +72,9 @@ function intervalToHuman(interval) {
75
72
  }
76
73
  }
77
74
  export {
78
- MIN_SCHEDULE_INTERVAL_MS,
79
75
  calculateNextRunFromInterval,
80
76
  intervalToHuman,
81
77
  parseInterval,
82
- resolveScheduleIntervalMs,
83
78
  validateInterval
84
79
  };
85
80
  //# sourceMappingURL=intervalParser.js.map
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../../src/modules/scheduler/lib/intervalParser.ts"],
4
- "sourcesContent": ["/**\n * Parse simple interval strings like '15m', '2h', '1d' into milliseconds\n */\nexport const MIN_SCHEDULE_INTERVAL_MS = 60 * 1000\n\nexport function parseInterval(interval: string): number {\n const regex = /^(\\d+)(s|m|h|d)$/\n const match = interval.match(regex)\n \n if (!match) {\n throw new Error(`Invalid interval format: ${interval}. Expected format: <number><unit> (e.g., 15m, 2h, 1d)`)\n }\n \n const value = parseInt(match[1], 10)\n const unit = match[2]\n \n const multipliers: Record<string, number> = {\n s: 1000, // seconds\n m: 60 * 1000, // minutes\n h: 60 * 60 * 1000, // hours\n d: 24 * 60 * 60 * 1000, // days\n }\n \n return value * multipliers[unit]\n}\n\nexport function resolveScheduleIntervalMs(interval: string): number {\n return Math.max(parseInterval(interval), MIN_SCHEDULE_INTERVAL_MS)\n}\n\n/**\n * Calculate next run time based on interval\n */\nexport function calculateNextRunFromInterval(\n interval: string,\n fromDate: Date = new Date()\n): Date {\n const ms = resolveScheduleIntervalMs(interval)\n return new Date(fromDate.getTime() + ms)\n}\n\n/**\n * Validate an interval string\n */\nexport function validateInterval(interval: string): boolean {\n try {\n return parseInterval(interval) >= MIN_SCHEDULE_INTERVAL_MS\n } catch {\n return false\n }\n}\n\n/**\n * Convert interval to human-readable string\n * Preserves the original unit unless it can be cleanly converted to a larger unit\n * Special case: Zero always displays as \"0 seconds\"\n */\nexport function intervalToHuman(interval: string): string {\n try {\n const regex = /^(\\d+)(s|m|h|d)$/\n const match = interval.match(regex)\n \n if (!match) {\n return interval\n }\n \n const unit = match[2]\n \n const ms = parseInterval(interval)\n const seconds = ms / 1000\n \n // Special case: zero always displays as \"0 seconds\"\n if (seconds === 0) {\n return '0 seconds'\n }\n \n const minutes = seconds / 60\n const hours = minutes / 60\n const days = hours / 24\n \n // Only convert to larger units based on the input unit\n // This preserves the original unit choice (e.g., 60s stays as \"60 seconds\")\n switch (unit) {\n case 's':\n // Seconds never convert up (preserve user's choice)\n return `${seconds} second${seconds !== 1 ? 's' : ''}`\n \n case 'm':\n // Minutes can convert to hours or days\n if (days >= 1 && days === Math.floor(days)) {\n return `${days} day${days !== 1 ? 's' : ''}`\n }\n if (hours >= 1 && hours === Math.floor(hours)) {\n return `${hours} hour${hours !== 1 ? 's' : ''}`\n }\n return `${minutes} minute${minutes !== 1 ? 's' : ''}`\n \n case 'h':\n // Hours can convert to days\n if (days >= 1 && days === Math.floor(days)) {\n return `${days} day${days !== 1 ? 's' : ''}`\n }\n return `${hours} hour${hours !== 1 ? 's' : ''}`\n \n case 'd':\n // Days stay as days\n return `${days} day${days !== 1 ? 's' : ''}`\n \n default:\n return interval\n }\n } catch {\n return interval\n }\n}\n"],
5
- "mappings": "AAGO,MAAM,2BAA2B,KAAK;AAEtC,SAAS,cAAc,UAA0B;AACtD,QAAM,QAAQ;AACd,QAAM,QAAQ,SAAS,MAAM,KAAK;AAElC,MAAI,CAAC,OAAO;AACV,UAAM,IAAI,MAAM,4BAA4B,QAAQ,uDAAuD;AAAA,EAC7G;AAEA,QAAM,QAAQ,SAAS,MAAM,CAAC,GAAG,EAAE;AACnC,QAAM,OAAO,MAAM,CAAC;AAEpB,QAAM,cAAsC;AAAA,IAC1C,GAAG;AAAA;AAAA,IACH,GAAG,KAAK;AAAA;AAAA,IACR,GAAG,KAAK,KAAK;AAAA;AAAA,IACb,GAAG,KAAK,KAAK,KAAK;AAAA;AAAA,EACpB;AAEA,SAAO,QAAQ,YAAY,IAAI;AACjC;AAEO,SAAS,0BAA0B,UAA0B;AAClE,SAAO,KAAK,IAAI,cAAc,QAAQ,GAAG,wBAAwB;AACnE;AAKO,SAAS,6BACd,UACA,WAAiB,oBAAI,KAAK,GACpB;AACN,QAAM,KAAK,0BAA0B,QAAQ;AAC7C,SAAO,IAAI,KAAK,SAAS,QAAQ,IAAI,EAAE;AACzC;AAKO,SAAS,iBAAiB,UAA2B;AAC1D,MAAI;AACF,WAAO,cAAc,QAAQ,KAAK;AAAA,EACpC,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAOO,SAAS,gBAAgB,UAA0B;AACxD,MAAI;AACF,UAAM,QAAQ;AACd,UAAM,QAAQ,SAAS,MAAM,KAAK;AAElC,QAAI,CAAC,OAAO;AACV,aAAO;AAAA,IACT;AAEA,UAAM,OAAO,MAAM,CAAC;AAEpB,UAAM,KAAK,cAAc,QAAQ;AACjC,UAAM,UAAU,KAAK;AAGrB,QAAI,YAAY,GAAG;AACjB,aAAO;AAAA,IACT;AAEA,UAAM,UAAU,UAAU;AAC1B,UAAM,QAAQ,UAAU;AACxB,UAAM,OAAO,QAAQ;AAIrB,YAAQ,MAAM;AAAA,MACZ,KAAK;AAEH,eAAO,GAAG,OAAO,UAAU,YAAY,IAAI,MAAM,EAAE;AAAA,MAErD,KAAK;AAEH,YAAI,QAAQ,KAAK,SAAS,KAAK,MAAM,IAAI,GAAG;AAC1C,iBAAO,GAAG,IAAI,OAAO,SAAS,IAAI,MAAM,EAAE;AAAA,QAC5C;AACA,YAAI,SAAS,KAAK,UAAU,KAAK,MAAM,KAAK,GAAG;AAC7C,iBAAO,GAAG,KAAK,QAAQ,UAAU,IAAI,MAAM,EAAE;AAAA,QAC/C;AACA,eAAO,GAAG,OAAO,UAAU,YAAY,IAAI,MAAM,EAAE;AAAA,MAErD,KAAK;AAEH,YAAI,QAAQ,KAAK,SAAS,KAAK,MAAM,IAAI,GAAG;AAC1C,iBAAO,GAAG,IAAI,OAAO,SAAS,IAAI,MAAM,EAAE;AAAA,QAC5C;AACA,eAAO,GAAG,KAAK,QAAQ,UAAU,IAAI,MAAM,EAAE;AAAA,MAE/C,KAAK;AAEH,eAAO,GAAG,IAAI,OAAO,SAAS,IAAI,MAAM,EAAE;AAAA,MAE5C;AACE,eAAO;AAAA,IACX;AAAA,EACF,QAAQ;AACN,WAAO;AAAA,EACT;AACF;",
4
+ "sourcesContent": ["/**\n * Parse simple interval strings like '15m', '2h', '1d' into milliseconds\n */\nexport function parseInterval(interval: string): number {\n const regex = /^(\\d+)(s|m|h|d)$/\n const match = interval.match(regex)\n \n if (!match) {\n throw new Error(`Invalid interval format: ${interval}. Expected format: <number><unit> (e.g., 15m, 2h, 1d)`)\n }\n \n const value = parseInt(match[1], 10)\n const unit = match[2]\n \n const multipliers: Record<string, number> = {\n s: 1000, // seconds\n m: 60 * 1000, // minutes\n h: 60 * 60 * 1000, // hours\n d: 24 * 60 * 60 * 1000, // days\n }\n \n return value * multipliers[unit]\n}\n\n/**\n * Calculate next run time based on interval\n */\nexport function calculateNextRunFromInterval(\n interval: string,\n fromDate: Date = new Date()\n): Date {\n const ms = parseInterval(interval)\n return new Date(fromDate.getTime() + ms)\n}\n\n/**\n * Validate an interval string\n */\nexport function validateInterval(interval: string): boolean {\n try {\n parseInterval(interval)\n return true\n } catch {\n return false\n }\n}\n\n/**\n * Convert interval to human-readable string\n * Preserves the original unit unless it can be cleanly converted to a larger unit\n * Special case: Zero always displays as \"0 seconds\"\n */\nexport function intervalToHuman(interval: string): string {\n try {\n const regex = /^(\\d+)(s|m|h|d)$/\n const match = interval.match(regex)\n \n if (!match) {\n return interval\n }\n \n const unit = match[2]\n \n const ms = parseInterval(interval)\n const seconds = ms / 1000\n \n // Special case: zero always displays as \"0 seconds\"\n if (seconds === 0) {\n return '0 seconds'\n }\n \n const minutes = seconds / 60\n const hours = minutes / 60\n const days = hours / 24\n \n // Only convert to larger units based on the input unit\n // This preserves the original unit choice (e.g., 60s stays as \"60 seconds\")\n switch (unit) {\n case 's':\n // Seconds never convert up (preserve user's choice)\n return `${seconds} second${seconds !== 1 ? 's' : ''}`\n \n case 'm':\n // Minutes can convert to hours or days\n if (days >= 1 && days === Math.floor(days)) {\n return `${days} day${days !== 1 ? 's' : ''}`\n }\n if (hours >= 1 && hours === Math.floor(hours)) {\n return `${hours} hour${hours !== 1 ? 's' : ''}`\n }\n return `${minutes} minute${minutes !== 1 ? 's' : ''}`\n \n case 'h':\n // Hours can convert to days\n if (days >= 1 && days === Math.floor(days)) {\n return `${days} day${days !== 1 ? 's' : ''}`\n }\n return `${hours} hour${hours !== 1 ? 's' : ''}`\n \n case 'd':\n // Days stay as days\n return `${days} day${days !== 1 ? 's' : ''}`\n \n default:\n return interval\n }\n } catch {\n return interval\n }\n}\n"],
5
+ "mappings": "AAGO,SAAS,cAAc,UAA0B;AACtD,QAAM,QAAQ;AACd,QAAM,QAAQ,SAAS,MAAM,KAAK;AAElC,MAAI,CAAC,OAAO;AACV,UAAM,IAAI,MAAM,4BAA4B,QAAQ,uDAAuD;AAAA,EAC7G;AAEA,QAAM,QAAQ,SAAS,MAAM,CAAC,GAAG,EAAE;AACnC,QAAM,OAAO,MAAM,CAAC;AAEpB,QAAM,cAAsC;AAAA,IAC1C,GAAG;AAAA;AAAA,IACH,GAAG,KAAK;AAAA;AAAA,IACR,GAAG,KAAK,KAAK;AAAA;AAAA,IACb,GAAG,KAAK,KAAK,KAAK;AAAA;AAAA,EACpB;AAEA,SAAO,QAAQ,YAAY,IAAI;AACjC;AAKO,SAAS,6BACd,UACA,WAAiB,oBAAI,KAAK,GACpB;AACN,QAAM,KAAK,cAAc,QAAQ;AACjC,SAAO,IAAI,KAAK,SAAS,QAAQ,IAAI,EAAE;AACzC;AAKO,SAAS,iBAAiB,UAA2B;AAC1D,MAAI;AACF,kBAAc,QAAQ;AACtB,WAAO;AAAA,EACT,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAOO,SAAS,gBAAgB,UAA0B;AACxD,MAAI;AACF,UAAM,QAAQ;AACd,UAAM,QAAQ,SAAS,MAAM,KAAK;AAElC,QAAI,CAAC,OAAO;AACV,aAAO;AAAA,IACT;AAEA,UAAM,OAAO,MAAM,CAAC;AAEpB,UAAM,KAAK,cAAc,QAAQ;AACjC,UAAM,UAAU,KAAK;AAGrB,QAAI,YAAY,GAAG;AACjB,aAAO;AAAA,IACT;AAEA,UAAM,UAAU,UAAU;AAC1B,UAAM,QAAQ,UAAU;AACxB,UAAM,OAAO,QAAQ;AAIrB,YAAQ,MAAM;AAAA,MACZ,KAAK;AAEH,eAAO,GAAG,OAAO,UAAU,YAAY,IAAI,MAAM,EAAE;AAAA,MAErD,KAAK;AAEH,YAAI,QAAQ,KAAK,SAAS,KAAK,MAAM,IAAI,GAAG;AAC1C,iBAAO,GAAG,IAAI,OAAO,SAAS,IAAI,MAAM,EAAE;AAAA,QAC5C;AACA,YAAI,SAAS,KAAK,UAAU,KAAK,MAAM,KAAK,GAAG;AAC7C,iBAAO,GAAG,KAAK,QAAQ,UAAU,IAAI,MAAM,EAAE;AAAA,QAC/C;AACA,eAAO,GAAG,OAAO,UAAU,YAAY,IAAI,MAAM,EAAE;AAAA,MAErD,KAAK;AAEH,YAAI,QAAQ,KAAK,SAAS,KAAK,MAAM,IAAI,GAAG;AAC1C,iBAAO,GAAG,IAAI,OAAO,SAAS,IAAI,MAAM,EAAE;AAAA,QAC5C;AACA,eAAO,GAAG,KAAK,QAAQ,UAAU,IAAI,MAAM,EAAE;AAAA,MAE/C,KAAK;AAEH,eAAO,GAAG,IAAI,OAAO,SAAS,IAAI,MAAM,EAAE;AAAA,MAE5C;AACE,eAAO;AAAA,IACX;AAAA,EACF,QAAQ;AACN,WAAO;AAAA,EACT;AACF;",
6
6
  "names": []
7
7
  }
@@ -3,36 +3,58 @@ const logger = createLogger("scheduler").child({ component: "local" });
3
3
  class LocalLockStrategy {
4
4
  constructor(em) {
5
5
  this.em = em;
6
+ // Process-local by construction, so it only guards a single strategy
7
+ // instance. Invariant relied upon: exactly one LocalLockStrategy exists per
8
+ // process, because the only construction site is LocalSchedulerService
9
+ // (an Awilix singleton) and only the CLI entry points start the polling
10
+ // engine. A caller that resolves a second container would silently get an
11
+ // independent guard — see the single-instance warning in
12
+ // LocalSchedulerService.start().
13
+ this.heldKeys = /* @__PURE__ */ new Set();
6
14
  }
7
15
  /**
8
- * Execute a function under a PostgreSQL advisory lock.
16
+ * Execute a function under a mutual-exclusion lock.
9
17
  *
10
- * IMPORTANT: Uses transaction-scoped advisory locks (`pg_try_advisory_xact_lock`)
11
- * to avoid connection pool/session mismatch issues. The lock is automatically
12
- * released when the transaction ends.
18
+ * In-process exclusion for the whole duration of `fn` comes from `heldKeys`
19
+ * (this strategy is single-instance by contract). The transaction-scoped
20
+ * advisory lock (`pg_try_advisory_xact_lock`) only guards the claim itself
21
+ * against a concurrently claiming process and is released when the short
22
+ * claim transaction commits, BEFORE `fn` runs.
23
+ *
24
+ * IMPORTANT: `fn` must NOT run inside that transaction. Holding the
25
+ * transaction open across `fn` leaves the connection idle-in-transaction
26
+ * while `fn` awaits non-DB work; the pool's default
27
+ * `idle_in_transaction_session_timeout` (120s) then makes Postgres kill the
28
+ * connection (FATAL 25P03), which crashes the scheduler process.
13
29
  */
14
30
  async runWithLock(key, fn) {
15
- const em = this.em().fork();
16
- const hash = this.hashString(key);
17
- let lockAcquired = false;
31
+ if (this.heldKeys.has(key)) {
32
+ return { acquired: false };
33
+ }
34
+ this.heldKeys.add(key);
18
35
  try {
19
- return await em.transactional(async (txEm) => {
20
- const result = await txEm.getConnection().execute(
21
- `SELECT pg_try_advisory_xact_lock(?) as acquired`,
22
- [hash]
23
- );
24
- const acquired = result[0]?.acquired === true;
25
- if (!acquired) return { acquired: false };
26
- lockAcquired = true;
27
- const fnResult = await fn();
28
- return { acquired: true, result: fnResult };
29
- });
30
- } catch (error) {
31
- if (lockAcquired) {
32
- throw error;
36
+ const em = this.em().fork();
37
+ const hash = this.hashString(key);
38
+ let claimed = false;
39
+ try {
40
+ claimed = await em.transactional(async (txEm) => {
41
+ const result = await txEm.getConnection().execute(
42
+ `SELECT pg_try_advisory_xact_lock(?) as acquired`,
43
+ [hash]
44
+ );
45
+ return result[0]?.acquired === true;
46
+ });
47
+ } catch (error) {
48
+ logger.error("Failed to acquire lock", { lockKey: key, err: error });
49
+ return { acquired: false };
33
50
  }
34
- logger.error("Failed to acquire lock", { lockKey: key, err: error });
35
- return { acquired: false };
51
+ if (!claimed) {
52
+ return { acquired: false };
53
+ }
54
+ const fnResult = await fn();
55
+ return { acquired: true, result: fnResult };
56
+ } finally {
57
+ this.heldKeys.delete(key);
36
58
  }
37
59
  }
38
60
  /**
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../../src/modules/scheduler/lib/localLockStrategy.ts"],
4
- "sourcesContent": ["import type { EntityManager } from '@mikro-orm/core'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('scheduler').child({ component: 'local' })\n\n/**\n * PostgreSQL advisory lock strategy for single-instance or local development\n */\nexport class LocalLockStrategy {\n constructor(private em: () => EntityManager) {}\n\n /**\n * Execute a function under a PostgreSQL advisory lock.\n *\n * IMPORTANT: Uses transaction-scoped advisory locks (`pg_try_advisory_xact_lock`)\n * to avoid connection pool/session mismatch issues. The lock is automatically\n * released when the transaction ends.\n */\n async runWithLock<T>(key: string, fn: () => Promise<T>): Promise<{ acquired: boolean; result?: T }> {\n const em = this.em().fork()\n const hash = this.hashString(key)\n let lockAcquired = false\n\n try {\n return await em.transactional(async (txEm) => {\n const result = await txEm.getConnection().execute<{ acquired: boolean }[]>(\n `SELECT pg_try_advisory_xact_lock(?) as acquired`,\n [hash],\n )\n\n const acquired = result[0]?.acquired === true\n if (!acquired) return { acquired: false }\n lockAcquired = true\n\n const fnResult = await fn()\n return { acquired: true, result: fnResult }\n })\n } catch (error) {\n if (lockAcquired) {\n throw error\n }\n\n logger.error('Failed to acquire lock', { lockKey: key, err: error })\n return { acquired: false }\n }\n }\n\n /**\n * Convert string to integer hash for PostgreSQL advisory locks\n * PostgreSQL advisory locks use bigint, so we need to hash the string\n */\n private hashString(str: string): number {\n let hash = 0\n for (let i = 0; i < str.length; i++) {\n const char = str.charCodeAt(i)\n hash = ((hash << 5) - hash) + char\n hash = hash & hash // Convert to 32bit integer\n }\n return Math.abs(hash)\n }\n}\n"],
5
- "mappings": "AACA,SAAS,oBAAoB;AAE7B,MAAM,SAAS,aAAa,WAAW,EAAE,MAAM,EAAE,WAAW,QAAQ,CAAC;AAK9D,MAAM,kBAAkB;AAAA,EAC7B,YAAoB,IAAyB;AAAzB;AAAA,EAA0B;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAS9C,MAAM,YAAe,KAAa,IAAkE;AAClG,UAAM,KAAK,KAAK,GAAG,EAAE,KAAK;AAC1B,UAAM,OAAO,KAAK,WAAW,GAAG;AAChC,QAAI,eAAe;AAEnB,QAAI;AACF,aAAO,MAAM,GAAG,cAAc,OAAO,SAAS;AAC5C,cAAM,SAAS,MAAM,KAAK,cAAc,EAAE;AAAA,UACxC;AAAA,UACA,CAAC,IAAI;AAAA,QACP;AAEA,cAAM,WAAW,OAAO,CAAC,GAAG,aAAa;AACzC,YAAI,CAAC,SAAU,QAAO,EAAE,UAAU,MAAM;AACxC,uBAAe;AAEf,cAAM,WAAW,MAAM,GAAG;AAC1B,eAAO,EAAE,UAAU,MAAM,QAAQ,SAAS;AAAA,MAC5C,CAAC;AAAA,IACH,SAAS,OAAO;AACd,UAAI,cAAc;AAChB,cAAM;AAAA,MACR;AAEA,aAAO,MAAM,0BAA0B,EAAE,SAAS,KAAK,KAAK,MAAM,CAAC;AACnE,aAAO,EAAE,UAAU,MAAM;AAAA,IAC3B;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA,EAMQ,WAAW,KAAqB;AACtC,QAAI,OAAO;AACX,aAAS,IAAI,GAAG,IAAI,IAAI,QAAQ,KAAK;AACnC,YAAM,OAAO,IAAI,WAAW,CAAC;AAC7B,cAAS,QAAQ,KAAK,OAAQ;AAC9B,aAAO,OAAO;AAAA,IAChB;AACA,WAAO,KAAK,IAAI,IAAI;AAAA,EACtB;AACF;",
4
+ "sourcesContent": ["import type { EntityManager } from '@mikro-orm/core'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('scheduler').child({ component: 'local' })\n\n/**\n * Mutual-exclusion strategy for single-instance or local development.\n *\n * Exclusion for the duration of the guarded run is IN-PROCESS (`heldKeys`).\n * The PostgreSQL advisory lock only serialises concurrent *claims* \u2014 it is\n * transaction-scoped and released as soon as the short claim transaction\n * commits, before the guarded function runs. It therefore does NOT protect\n * against two processes executing the same key concurrently; that matches the\n * documented single-instance contract of the local scheduler strategy, and\n * `LocalSchedulerService.start()` warns about it at startup.\n */\nexport class LocalLockStrategy {\n // Process-local by construction, so it only guards a single strategy\n // instance. Invariant relied upon: exactly one LocalLockStrategy exists per\n // process, because the only construction site is LocalSchedulerService\n // (an Awilix singleton) and only the CLI entry points start the polling\n // engine. A caller that resolves a second container would silently get an\n // independent guard \u2014 see the single-instance warning in\n // LocalSchedulerService.start().\n private heldKeys = new Set<string>()\n\n constructor(private em: () => EntityManager) {}\n\n /**\n * Execute a function under a mutual-exclusion lock.\n *\n * In-process exclusion for the whole duration of `fn` comes from `heldKeys`\n * (this strategy is single-instance by contract). The transaction-scoped\n * advisory lock (`pg_try_advisory_xact_lock`) only guards the claim itself\n * against a concurrently claiming process and is released when the short\n * claim transaction commits, BEFORE `fn` runs.\n *\n * IMPORTANT: `fn` must NOT run inside that transaction. Holding the\n * transaction open across `fn` leaves the connection idle-in-transaction\n * while `fn` awaits non-DB work; the pool's default\n * `idle_in_transaction_session_timeout` (120s) then makes Postgres kill the\n * connection (FATAL 25P03), which crashes the scheduler process.\n */\n async runWithLock<T>(key: string, fn: () => Promise<T>): Promise<{ acquired: boolean; result?: T }> {\n if (this.heldKeys.has(key)) {\n return { acquired: false }\n }\n // Reserve synchronously before the async claim so a concurrent in-process\n // caller cannot slip in between our claim transaction committing (which\n // releases the advisory xact lock) and the start of `fn`.\n this.heldKeys.add(key)\n\n try {\n const em = this.em().fork()\n const hash = this.hashString(key)\n let claimed = false\n\n try {\n claimed = await em.transactional(async (txEm) => {\n const result = await txEm.getConnection().execute<{ acquired: boolean }[]>(\n `SELECT pg_try_advisory_xact_lock(?) as acquired`,\n [hash],\n )\n return result[0]?.acquired === true\n })\n } catch (error) {\n logger.error('Failed to acquire lock', { lockKey: key, err: error })\n return { acquired: false }\n }\n\n if (!claimed) {\n return { acquired: false }\n }\n\n const fnResult = await fn()\n return { acquired: true, result: fnResult }\n } finally {\n this.heldKeys.delete(key)\n }\n }\n\n /**\n * Convert string to integer hash for PostgreSQL advisory locks\n * PostgreSQL advisory locks use bigint, so we need to hash the string\n */\n private hashString(str: string): number {\n let hash = 0\n for (let i = 0; i < str.length; i++) {\n const char = str.charCodeAt(i)\n hash = ((hash << 5) - hash) + char\n hash = hash & hash // Convert to 32bit integer\n }\n return Math.abs(hash)\n }\n}\n"],
5
+ "mappings": "AACA,SAAS,oBAAoB;AAE7B,MAAM,SAAS,aAAa,WAAW,EAAE,MAAM,EAAE,WAAW,QAAQ,CAAC;AAa9D,MAAM,kBAAkB;AAAA,EAU7B,YAAoB,IAAyB;AAAzB;AAFpB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,SAAQ,WAAW,oBAAI,IAAY;AAAA,EAEW;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAiB9C,MAAM,YAAe,KAAa,IAAkE;AAClG,QAAI,KAAK,SAAS,IAAI,GAAG,GAAG;AAC1B,aAAO,EAAE,UAAU,MAAM;AAAA,IAC3B;AAIA,SAAK,SAAS,IAAI,GAAG;AAErB,QAAI;AACF,YAAM,KAAK,KAAK,GAAG,EAAE,KAAK;AAC1B,YAAM,OAAO,KAAK,WAAW,GAAG;AAChC,UAAI,UAAU;AAEd,UAAI;AACF,kBAAU,MAAM,GAAG,cAAc,OAAO,SAAS;AAC/C,gBAAM,SAAS,MAAM,KAAK,cAAc,EAAE;AAAA,YACxC;AAAA,YACA,CAAC,IAAI;AAAA,UACP;AACA,iBAAO,OAAO,CAAC,GAAG,aAAa;AAAA,QACjC,CAAC;AAAA,MACH,SAAS,OAAO;AACd,eAAO,MAAM,0BAA0B,EAAE,SAAS,KAAK,KAAK,MAAM,CAAC;AACnE,eAAO,EAAE,UAAU,MAAM;AAAA,MAC3B;AAEA,UAAI,CAAC,SAAS;AACZ,eAAO,EAAE,UAAU,MAAM;AAAA,MAC3B;AAEA,YAAM,WAAW,MAAM,GAAG;AAC1B,aAAO,EAAE,UAAU,MAAM,QAAQ,SAAS;AAAA,IAC5C,UAAE;AACA,WAAK,SAAS,OAAO,GAAG;AAAA,IAC1B;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA,EAMQ,WAAW,KAAqB;AACtC,QAAI,OAAO;AACX,aAAS,IAAI,GAAG,IAAI,IAAI,QAAQ,KAAK;AACnC,YAAM,OAAO,IAAI,WAAW,CAAC;AAC7B,cAAS,QAAQ,KAAK,OAAQ;AAC9B,aAAO,OAAO;AAAA,IAChB;AACA,WAAO,KAAK,IAAI,IAAI;AAAA,EACtB;AACF;",
6
6
  "names": []
7
7
  }
@@ -1,5 +1,5 @@
1
1
  import { parseCronExpression } from "./cronParser.js";
2
- import { calculateNextRunFromInterval, validateInterval } from "./intervalParser.js";
2
+ import { calculateNextRunFromInterval } from "./intervalParser.js";
3
3
  function calculateNextRun(scheduleType, scheduleValue, timezone = "UTC", fromDate) {
4
4
  const baseDate = fromDate || /* @__PURE__ */ new Date();
5
5
  if (scheduleType === "cron") {
@@ -15,18 +15,11 @@ function calculateNextRun(scheduleType, scheduleValue, timezone = "UTC", fromDat
15
15
  }
16
16
  return null;
17
17
  }
18
- function calculateNextRunForWrite(scheduleType, scheduleValue, timezone = "UTC", fromDate) {
19
- if (scheduleType === "interval" && !validateInterval(scheduleValue)) {
20
- return null;
21
- }
22
- return calculateNextRun(scheduleType, scheduleValue, timezone, fromDate);
23
- }
24
18
  function recalculateNextRun(scheduleType, scheduleValue, timezone = "UTC") {
25
19
  return calculateNextRun(scheduleType, scheduleValue, timezone, /* @__PURE__ */ new Date());
26
20
  }
27
21
  export {
28
22
  calculateNextRun,
29
- calculateNextRunForWrite,
30
23
  recalculateNextRun
31
24
  };
32
25
  //# sourceMappingURL=nextRunCalculator.js.map
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../../src/modules/scheduler/lib/nextRunCalculator.ts"],
4
- "sourcesContent": ["import { parseCronExpression } from './cronParser.js'\nimport { calculateNextRunFromInterval, validateInterval } from './intervalParser.js'\n\n/**\n * Calculate the next run time for a schedule\n */\nexport function calculateNextRun(\n scheduleType: 'cron' | 'interval',\n scheduleValue: string,\n timezone: string = 'UTC',\n fromDate?: Date\n): Date | null {\n const baseDate = fromDate || new Date()\n \n if (scheduleType === 'cron') {\n const result = parseCronExpression(scheduleValue, timezone, baseDate)\n return result.nextRun || null\n }\n \n if (scheduleType === 'interval') {\n try {\n return calculateNextRunFromInterval(scheduleValue, baseDate)\n } catch {\n return null\n }\n }\n \n return null\n}\n\nexport function calculateNextRunForWrite(\n scheduleType: 'cron' | 'interval',\n scheduleValue: string,\n timezone: string = 'UTC',\n fromDate?: Date,\n): Date | null {\n if (scheduleType === 'interval' && !validateInterval(scheduleValue)) {\n return null\n }\n\n return calculateNextRun(scheduleType, scheduleValue, timezone, fromDate)\n}\n\n/**\n * Recalculate next run for a schedule after execution\n */\nexport function recalculateNextRun(\n scheduleType: 'cron' | 'interval',\n scheduleValue: string,\n timezone: string = 'UTC'\n): Date | null {\n // Always calculate from current time (not from last run)\n // This prevents drift and missed executions\n return calculateNextRun(scheduleType, scheduleValue, timezone, new Date())\n}\n"],
5
- "mappings": "AAAA,SAAS,2BAA2B;AACpC,SAAS,8BAA8B,wBAAwB;AAKxD,SAAS,iBACd,cACA,eACA,WAAmB,OACnB,UACa;AACb,QAAM,WAAW,YAAY,oBAAI,KAAK;AAEtC,MAAI,iBAAiB,QAAQ;AAC3B,UAAM,SAAS,oBAAoB,eAAe,UAAU,QAAQ;AACpE,WAAO,OAAO,WAAW;AAAA,EAC3B;AAEA,MAAI,iBAAiB,YAAY;AAC/B,QAAI;AACF,aAAO,6BAA6B,eAAe,QAAQ;AAAA,IAC7D,QAAQ;AACN,aAAO;AAAA,IACT;AAAA,EACF;AAEA,SAAO;AACT;AAEO,SAAS,yBACd,cACA,eACA,WAAmB,OACnB,UACa;AACb,MAAI,iBAAiB,cAAc,CAAC,iBAAiB,aAAa,GAAG;AACnE,WAAO;AAAA,EACT;AAEA,SAAO,iBAAiB,cAAc,eAAe,UAAU,QAAQ;AACzE;AAKO,SAAS,mBACd,cACA,eACA,WAAmB,OACN;AAGb,SAAO,iBAAiB,cAAc,eAAe,UAAU,oBAAI,KAAK,CAAC;AAC3E;",
4
+ "sourcesContent": ["import { parseCronExpression } from './cronParser.js'\nimport { calculateNextRunFromInterval } from './intervalParser.js'\n\n/**\n * Calculate the next run time for a schedule\n */\nexport function calculateNextRun(\n scheduleType: 'cron' | 'interval',\n scheduleValue: string,\n timezone: string = 'UTC',\n fromDate?: Date\n): Date | null {\n const baseDate = fromDate || new Date()\n \n if (scheduleType === 'cron') {\n const result = parseCronExpression(scheduleValue, timezone, baseDate)\n return result.nextRun || null\n }\n \n if (scheduleType === 'interval') {\n try {\n return calculateNextRunFromInterval(scheduleValue, baseDate)\n } catch {\n return null\n }\n }\n \n return null\n}\n\n/**\n * Recalculate next run for a schedule after execution\n */\nexport function recalculateNextRun(\n scheduleType: 'cron' | 'interval',\n scheduleValue: string,\n timezone: string = 'UTC'\n): Date | null {\n // Always calculate from current time (not from last run)\n // This prevents drift and missed executions\n return calculateNextRun(scheduleType, scheduleValue, timezone, new Date())\n}\n"],
5
+ "mappings": "AAAA,SAAS,2BAA2B;AACpC,SAAS,oCAAoC;AAKtC,SAAS,iBACd,cACA,eACA,WAAmB,OACnB,UACa;AACb,QAAM,WAAW,YAAY,oBAAI,KAAK;AAEtC,MAAI,iBAAiB,QAAQ;AAC3B,UAAM,SAAS,oBAAoB,eAAe,UAAU,QAAQ;AACpE,WAAO,OAAO,WAAW;AAAA,EAC3B;AAEA,MAAI,iBAAiB,YAAY;AAC/B,QAAI;AACF,aAAO,6BAA6B,eAAe,QAAQ;AAAA,IAC7D,QAAQ;AACN,aAAO;AAAA,IACT;AAAA,EACF;AAEA,SAAO;AACT;AAKO,SAAS,mBACd,cACA,eACA,WAAmB,OACN;AAGb,SAAO,iBAAiB,cAAc,eAAe,UAAU,oBAAI,KAAK,CAAC;AAC3E;",
6
6
  "names": []
7
7
  }
@@ -1,8 +1,8 @@
1
1
  import { ScheduledJob } from "../data/entities.js";
2
2
  import { recalculateNextRun } from "../lib/nextRunCalculator.js";
3
3
  import { parseCronExpression } from "../lib/cronParser.js";
4
- import { resolveScheduleIntervalMs } from "../lib/intervalParser.js";
5
- import { getRedisUrlOrThrow, parseRedisUrl } from "@open-mercato/shared/lib/redis/connection";
4
+ import { parseInterval } from "../lib/intervalParser.js";
5
+ import { getRedisUrlOrThrow } from "@open-mercato/shared/lib/redis/connection";
6
6
  import { createLogger } from "@open-mercato/shared/lib/logger";
7
7
  const logger = createLogger("scheduler").child({ component: "bullmq" });
8
8
  class BullMQSchedulerService {
@@ -17,9 +17,7 @@ class BullMQSchedulerService {
17
17
  if (!this.queue) {
18
18
  try {
19
19
  const { Queue } = await import("bullmq");
20
- this.queue = new Queue("scheduler-execution", {
21
- connection: parseRedisUrl(getRedisUrlOrThrow("QUEUE"))
22
- });
20
+ this.queue = new Queue("scheduler-execution", { connection: { url: getRedisUrlOrThrow("QUEUE") } });
23
21
  } catch {
24
22
  throw new Error("BullMQ is required for async scheduler. Install it with: npm install bullmq");
25
23
  }
@@ -29,24 +27,15 @@ class BullMQSchedulerService {
29
27
  getScheduleJobName(scheduleId) {
30
28
  return `schedule-${scheduleId}`;
31
29
  }
32
- getScheduleIdFromJobScheduler(job) {
33
- const candidate = [job.key, job.id, job.name].find((value) => value?.startsWith("schedule-"));
30
+ getScheduleIdFromRepeatableJob(job) {
31
+ const candidate = job.id?.startsWith("schedule-") ? job.id : job.name?.startsWith("schedule-") ? job.name : null;
34
32
  return candidate ? candidate.slice("schedule-".length) : null;
35
33
  }
36
- isJobSchedulerForSchedule(job, scheduleId) {
37
- return this.getScheduleIdFromJobScheduler(job) === scheduleId;
38
- }
39
- isCanonicalJobScheduler(job, scheduleId) {
40
- return job.key === this.getScheduleJobName(scheduleId);
41
- }
42
- supportsJobSchedulers(queue) {
43
- return typeof queue.upsertJobScheduler === "function" && typeof queue.getJobSchedulers === "function" && typeof queue.removeJobScheduler === "function";
44
- }
45
34
  isRepeatableJobForSchedule(job, scheduleId) {
46
35
  const jobName = this.getScheduleJobName(scheduleId);
47
36
  return job.id === jobName || job.name === jobName;
48
37
  }
49
- async removeLegacyRepeatableJobs(queue, scheduleId) {
38
+ async removeRepeatableJobsForSchedule(queue, scheduleId) {
50
39
  const repeatableJobs = await queue.getRepeatableJobs?.();
51
40
  if (!repeatableJobs || typeof queue.removeRepeatableByKey !== "function") {
52
41
  return 0;
@@ -60,7 +49,7 @@ class BullMQSchedulerService {
60
49
  return removed;
61
50
  }
62
51
  /**
63
- * Register a schedule with BullMQ Job Schedulers
52
+ * Register a schedule with BullMQ repeatable jobs
64
53
  * @param schedule - The schedule to register
65
54
  * @param options - Optional configuration
66
55
  * @param options.skipNextRunUpdate - If true, skip updating nextRunAt (used when called from hooks)
@@ -84,6 +73,7 @@ class BullMQSchedulerService {
84
73
  const repeatOpts = this.buildRepeatOptions(schedule);
85
74
  const queue = await this.getQueue();
86
75
  const jobName = this.getScheduleJobName(schedule.id);
76
+ await this.removeRepeatableJobsForSchedule(queue, schedule.id);
87
77
  const jobData = {
88
78
  id: jobName,
89
79
  payload: {
@@ -94,7 +84,7 @@ class BullMQSchedulerService {
94
84
  },
95
85
  createdAt: (/* @__PURE__ */ new Date()).toISOString()
96
86
  };
97
- logger.debug("Upserting job scheduler", {
87
+ logger.debug("Adding repeatable job", {
98
88
  jobName,
99
89
  scheduleId: schedule.id,
100
90
  scopeType: schedule.scopeType,
@@ -102,36 +92,28 @@ class BullMQSchedulerService {
102
92
  organizationId: schedule.organizationId,
103
93
  repeatOpts
104
94
  });
105
- const jobOptions = {
106
- removeOnComplete: {
107
- age: 86400 * 30,
108
- count: 1e3
109
- },
110
- removeOnFail: {
111
- age: 86400 * 90,
112
- count: 5e3
113
- }
114
- };
115
- if (this.supportsJobSchedulers(queue)) {
116
- const existingJobSchedulers = await queue.getJobSchedulers();
117
- await queue.upsertJobScheduler(
118
- jobName,
119
- repeatOpts,
120
- {
121
- name: jobName,
122
- data: jobData,
123
- opts: jobOptions
124
- }
125
- );
126
- for (const jobScheduler of existingJobSchedulers) {
127
- if (this.isJobSchedulerForSchedule(jobScheduler, schedule.id) && !this.isCanonicalJobScheduler(jobScheduler, schedule.id)) {
128
- await queue.removeJobScheduler(jobScheduler.key);
95
+ await queue.add(
96
+ jobName,
97
+ // Job name - used as part of repeatable job key
98
+ jobData,
99
+ // Job data in QueuedJob format
100
+ {
101
+ repeat: repeatOpts,
102
+ // Don't set jobId for repeatable jobs - BullMQ generates unique IDs for each instance
103
+ removeOnComplete: {
104
+ age: 86400 * 30,
105
+ // Keep completed jobs for 30 days (execution history)
106
+ count: 1e3
107
+ // Keep last 1000 completed jobs
108
+ },
109
+ removeOnFail: {
110
+ age: 86400 * 90,
111
+ // Keep failed jobs for 90 days (debugging/audit)
112
+ count: 5e3
113
+ // Keep last 5000 failed jobs
129
114
  }
130
115
  }
131
- } else {
132
- await this.removeLegacyRepeatableJobs(queue, schedule.id);
133
- await queue.add(jobName, jobData, { repeat: repeatOpts, ...jobOptions });
134
- }
116
+ );
135
117
  logger.debug("Registered schedule", {
136
118
  scheduleId: schedule.id,
137
119
  scheduleName: schedule.name,
@@ -145,25 +127,12 @@ class BullMQSchedulerService {
145
127
  }
146
128
  }
147
129
  /**
148
- * Unregister a schedule from BullMQ Job Schedulers
130
+ * Unregister a schedule from BullMQ repeatable jobs
149
131
  */
150
132
  async unregister(scheduleId) {
151
133
  try {
152
134
  const queue = await this.getQueue();
153
- if (this.supportsJobSchedulers(queue)) {
154
- const jobSchedulers = await queue.getJobSchedulers();
155
- const matchingJobSchedulers = jobSchedulers.filter((job) => this.isJobSchedulerForSchedule(job, scheduleId));
156
- if (matchingJobSchedulers.length > 0) {
157
- for (const jobScheduler of matchingJobSchedulers) {
158
- await queue.removeJobScheduler(jobScheduler.key);
159
- }
160
- logger.debug("Unregistered schedule", { scheduleId });
161
- } else {
162
- logger.debug("No job scheduler found for schedule", { scheduleId });
163
- }
164
- return;
165
- }
166
- const removed = await this.removeLegacyRepeatableJobs(queue, scheduleId);
135
+ const removed = await this.removeRepeatableJobsForSchedule(queue, scheduleId);
167
136
  if (removed > 0) {
168
137
  logger.debug("Unregistered schedule", { scheduleId });
169
138
  } else {
@@ -182,29 +151,14 @@ class BullMQSchedulerService {
182
151
  const em = this.em().fork();
183
152
  const queue = await this.getQueue();
184
153
  logger.debug("Starting full sync");
154
+ const repeatableJobs = await queue.getRepeatableJobs?.() || [];
185
155
  const bullmqScheduleIds = /* @__PURE__ */ new Set();
186
156
  const bullmqScheduleCounts = /* @__PURE__ */ new Map();
187
- const canonicalJobSchedulerIds = /* @__PURE__ */ new Set();
188
- if (this.supportsJobSchedulers(queue)) {
189
- const jobSchedulers = await queue.getJobSchedulers();
190
- for (const job of jobSchedulers) {
191
- const scheduleId = this.getScheduleIdFromJobScheduler(job);
192
- if (!scheduleId) continue;
193
- bullmqScheduleIds.add(scheduleId);
194
- bullmqScheduleCounts.set(scheduleId, (bullmqScheduleCounts.get(scheduleId) ?? 0) + 1);
195
- if (this.isCanonicalJobScheduler(job, scheduleId)) {
196
- canonicalJobSchedulerIds.add(scheduleId);
197
- }
198
- }
199
- } else {
200
- const repeatableJobs = await queue.getRepeatableJobs?.() ?? [];
201
- for (const job of repeatableJobs) {
202
- const candidate = job.id?.startsWith("schedule-") ? job.id : job.name?.startsWith("schedule-") ? job.name : null;
203
- if (!candidate) continue;
204
- const scheduleId = candidate.slice("schedule-".length);
205
- bullmqScheduleIds.add(scheduleId);
206
- bullmqScheduleCounts.set(scheduleId, (bullmqScheduleCounts.get(scheduleId) ?? 0) + 1);
207
- }
157
+ for (const job of repeatableJobs) {
158
+ const scheduleId = this.getScheduleIdFromRepeatableJob(job);
159
+ if (!scheduleId) continue;
160
+ bullmqScheduleIds.add(scheduleId);
161
+ bullmqScheduleCounts.set(scheduleId, (bullmqScheduleCounts.get(scheduleId) ?? 0) + 1);
208
162
  }
209
163
  const BATCH_SIZE = 500;
210
164
  const dbSchedules = [];
@@ -223,8 +177,8 @@ class BullMQSchedulerService {
223
177
  if (!bullmqScheduleIds.has(schedule.id)) {
224
178
  logger.debug("Registering missing schedule", { scheduleId: schedule.id, scheduleName: schedule.name });
225
179
  await this.register(schedule);
226
- } else if ((bullmqScheduleCounts.get(schedule.id) ?? 0) > 1 || !canonicalJobSchedulerIds.has(schedule.id)) {
227
- logger.info("Migrating legacy or duplicate job scheduler", { scheduleId: schedule.id });
180
+ } else if ((bullmqScheduleCounts.get(schedule.id) ?? 0) > 1) {
181
+ logger.info("Repairing duplicate repeatable jobs", { scheduleId: schedule.id });
228
182
  await this.register(schedule);
229
183
  }
230
184
  }
@@ -250,7 +204,7 @@ class BullMQSchedulerService {
250
204
  }
251
205
  opts.pattern = schedule.scheduleValue;
252
206
  } else if (schedule.scheduleType === "interval") {
253
- const intervalMs = resolveScheduleIntervalMs(schedule.scheduleValue);
207
+ const intervalMs = parseInterval(schedule.scheduleValue);
254
208
  opts.every = intervalMs;
255
209
  } else {
256
210
  throw new Error(`Unsupported schedule type: ${schedule.scheduleType}`);
@@ -258,17 +212,14 @@ class BullMQSchedulerService {
258
212
  return opts;
259
213
  }
260
214
  /**
261
- * Get list of all scheduled jobs from BullMQ
215
+ * Get list of all repeatable jobs from BullMQ
262
216
  */
263
217
  async getRepeatableJobs() {
264
218
  try {
265
219
  const queue = await this.getQueue();
266
- if (this.supportsJobSchedulers(queue)) {
267
- return await queue.getJobSchedulers();
268
- }
269
- return await queue.getRepeatableJobs?.() ?? [];
220
+ return await queue.getRepeatableJobs?.() || [];
270
221
  } catch (error) {
271
- logger.error("Failed to get job schedulers", { err: error });
222
+ logger.error("Failed to get repeatable jobs", { err: error });
272
223
  return [];
273
224
  }
274
225
  }