@open-mercato/scheduler 0.6.7-develop.6828.1.ab1620a63e → 0.6.7-develop.6842.1.8cd8a8883c

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.
@@ -3,7 +3,7 @@ import { z } from "zod";
3
3
  import { getAuthFromRequest } from "@open-mercato/shared/lib/auth/server";
4
4
  import { createRequestContainer } from "@open-mercato/shared/lib/di/container";
5
5
  import { ScheduledJob } from "../../../../data/entities.js";
6
- import { getRedisUrlOrThrow } from "@open-mercato/shared/lib/redis/connection";
6
+ import { getRedisUrlOrThrow, parseRedisUrl } from "@open-mercato/shared/lib/redis/connection";
7
7
  import { resolveTranslations } from "@open-mercato/shared/lib/i18n/server";
8
8
  import { createLogger } from "@open-mercato/shared/lib/logger";
9
9
  const logger = createLogger("scheduler").child({ component: "executions" });
@@ -48,7 +48,9 @@ async function GET(req, { params }) {
48
48
  }, { status: 400 });
49
49
  }
50
50
  const { Queue } = await import("bullmq");
51
- const queue = new Queue("scheduler-execution", { connection: { url: getRedisUrlOrThrow("QUEUE") } });
51
+ const queue = new Queue("scheduler-execution", {
52
+ connection: parseRedisUrl(getRedisUrlOrThrow("QUEUE"))
53
+ });
52
54
  try {
53
55
  const queryResult = executionsQuerySchema.safeParse({
54
56
  pageSize: req.nextUrl.searchParams.get("pageSize") ?? void 0
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../../../../../src/modules/scheduler/api/jobs/%5Bid%5D/executions/route.ts"],
4
- "sourcesContent": ["import { NextRequest, NextResponse } from 'next/server'\nimport { z } from 'zod'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport type { EntityManager } from '@mikro-orm/core'\nimport type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'\nimport { ScheduledJob } from '../../../../data/entities.js'\nimport { getRedisUrlOrThrow } from '@open-mercato/shared/lib/redis/connection'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('scheduler').child({ component: 'executions' })\n\n\nexport const metadata = {\n requireAuth: true,\n requireFeatures: ['scheduler.jobs.view'],\n}\n\n/**\n * GET /api/scheduler/jobs/[id]/executions\n * Fetch execution history for a schedule from BullMQ\n * \n * Returns jobs from the scheduler-execution queue filtered by scheduleId.\n * This replaces the old /api/scheduler/runs endpoint that used the database table.\n */\nexport async function GET(\n req: NextRequest,\n { params }: { params: { id: string } }\n) {\n const { translate } = await resolveTranslations()\n const auth = await getAuthFromRequest(req)\n if (!auth?.sub) {\n return NextResponse.json({ error: translate('scheduler.error.unauthorized', 'Unauthorized') }, { status: 401 })\n }\n\n const container = await createRequestContainer()\n const em = container.resolve<EntityManager>('em')\n\n const scheduleId = params.id\n\n try {\n // Verify schedule exists and user has access (with tenant/org scope filter)\n const findFilter: Record<string, unknown> = {\n id: scheduleId,\n deletedAt: null,\n }\n\n // Apply tenant isolation: scope the query to the user's tenant/org\n if (auth.tenantId) {\n findFilter.tenantId = auth.tenantId\n }\n if (auth.orgId) {\n findFilter.organizationId = auth.orgId\n }\n\n const schedule = await em.findOne(ScheduledJob, findFilter)\n\n if (!schedule) {\n return NextResponse.json({ error: translate('scheduler.error.not_found', 'Schedule not found') }, { status: 404 })\n }\n\n // System-scoped schedules (no tenantId/orgId) require super-admin. Use the\n // immutable `isSuperAdmin` flag \u2014 never compare mutable/spoofable role names.\n const isSuperAdmin = auth.isSuperAdmin === true\n if (!schedule.tenantId && !schedule.organizationId && !isSuperAdmin) {\n return NextResponse.json({ error: translate('scheduler.error.access_denied', 'Access denied') }, { status: 403 })\n }\n\n // Check if using async strategy\n const queueStrategy = process.env.QUEUE_STRATEGY || 'local'\n if (queueStrategy !== 'async') {\n return NextResponse.json({\n error: translate('scheduler.error.async_strategy_required', 'Execution history requires QUEUE_STRATEGY=async'),\n message: translate('scheduler.error.async_strategy_hint', 'Please set QUEUE_STRATEGY=async to view execution history'),\n items: [],\n }, { status: 400 })\n }\n\n // Fetch jobs from BullMQ scheduler-execution queue\n const { Queue } = await import('bullmq')\n const queue = new Queue('scheduler-execution', { connection: { url: getRedisUrlOrThrow('QUEUE') } })\n\n try {\n // Validate query params with Zod schema\n const queryResult = executionsQuerySchema.safeParse({\n pageSize: req.nextUrl.searchParams.get('pageSize') ?? undefined,\n })\n const limit = queryResult.success ? queryResult.data.pageSize : 20\n\n const [completed, failed, active, waiting, delayed] = await Promise.all([\n queue.getCompleted(0, limit - 1),\n queue.getFailed(0, limit - 1),\n queue.getActive(0, limit - 1),\n queue.getWaiting(0, limit - 1),\n queue.getDelayed(0, limit - 1),\n ])\n\n // Combine all jobs and filter by scheduleId\n const allJobs = [...completed, ...failed, ...active, ...waiting, ...delayed]\n type BullJobData = { payload?: { scheduleId?: string; triggerType?: string; triggeredByUserId?: string }; scheduleId?: string; triggerType?: string; triggeredByUserId?: string }\n\n const filteredJobs = allJobs\n .filter(job => {\n const data = job.data as BullJobData | undefined\n return data?.payload?.scheduleId === scheduleId || data?.scheduleId === scheduleId\n })\n .slice(0, limit)\n\n // Get state for each job (parallel)\n const jobsWithState = await Promise.all(\n filteredJobs.map(async (job) => {\n const state = await job.getState()\n const data = job.data as BullJobData | undefined\n \n return {\n id: job.id,\n scheduleId: data?.payload?.scheduleId || data?.scheduleId,\n startedAt: job.processedOn ? new Date(job.processedOn).toISOString() : new Date(job.timestamp).toISOString(),\n finishedAt: job.finishedOn ? new Date(job.finishedOn).toISOString() : null,\n status: state === 'completed' ? 'completed' : state === 'failed' ? 'failed' : state === 'active' ? 'running' : 'waiting',\n triggerType: data?.payload?.triggerType || data?.triggerType || 'scheduled',\n triggeredByUserId: data?.payload?.triggeredByUserId || data?.triggeredByUserId || null,\n errorMessage: job.failedReason || null,\n errorStack: job.stacktrace ? job.stacktrace.join('\\n') : null,\n durationMs: (job.finishedOn && job.processedOn) ? (job.finishedOn - job.processedOn) : null,\n queueJobId: job.id,\n queueName: 'scheduler-execution',\n attemptsMade: job.attemptsMade,\n result: job.returnvalue,\n }\n })\n )\n\n // Sort by startedAt descending (most recent first)\n jobsWithState.sort((a, b) => new Date(b.startedAt).getTime() - new Date(a.startedAt).getTime())\n\n return NextResponse.json({\n items: jobsWithState,\n total: jobsWithState.length,\n page: 1,\n pageSize: limit,\n })\n } finally {\n await queue.close()\n }\n\n } catch (error: unknown) {\n logger.error('Error fetching execution history', { err: error })\n return NextResponse.json(\n { error: error instanceof Error ? error.message : translate('scheduler.error.fetch_executions_failed', 'Failed to fetch execution history') },\n { status: 500 }\n )\n }\n}\n\n// Query schemas\nconst executionsQuerySchema = z.object({\n pageSize: z.coerce.number().int().min(1).max(100).default(20),\n})\n\n// Response schemas\nconst executionItemSchema = z.object({\n id: z.string(),\n scheduleId: z.string().uuid(),\n startedAt: z.string(),\n finishedAt: z.string().nullable(),\n status: z.enum(['running', 'completed', 'failed', 'waiting']),\n triggerType: z.enum(['scheduled', 'manual']),\n triggeredByUserId: z.string().uuid().nullable(),\n errorMessage: z.string().nullable(),\n errorStack: z.string().nullable(),\n durationMs: z.number().nullable(),\n queueJobId: z.string(),\n queueName: z.string(),\n attemptsMade: z.number(),\n result: z.unknown().nullable(),\n})\n\nconst executionsResponseSchema = z.object({\n items: z.array(executionItemSchema),\n total: z.number(),\n page: z.number(),\n pageSize: z.number(),\n})\n\nconst errorResponseSchema = z.object({\n error: z.string(),\n message: z.string().optional(),\n items: z.array(z.any()).optional(),\n})\n\n// OpenAPI specification\nexport const openApi: OpenApiRouteDoc = {\n tag: 'Scheduler',\n summary: 'Get execution history',\n description: 'Fetches recent execution history for a scheduled job from BullMQ.',\n methods: {\n GET: {\n operationId: 'getScheduleExecutions',\n summary: 'Get execution history for a schedule',\n description: 'Fetch recent executions from BullMQ for a scheduled job. Requires QUEUE_STRATEGY=async.',\n query: executionsQuerySchema,\n responses: [\n {\n status: 200,\n description: 'Execution history',\n schema: executionsResponseSchema,\n },\n ],\n errors: [\n { status: 400, description: 'Local strategy not supported', schema: errorResponseSchema },\n { status: 401, description: 'Unauthorized', schema: errorResponseSchema },\n { status: 403, description: 'Access denied', schema: errorResponseSchema },\n { status: 404, description: 'Schedule not found', schema: errorResponseSchema },\n ],\n },\n },\n}\n"],
5
- "mappings": "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",
4
+ "sourcesContent": ["import { NextRequest, NextResponse } from 'next/server'\nimport { z } from 'zod'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport type { EntityManager } from '@mikro-orm/core'\nimport type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'\nimport { ScheduledJob } from '../../../../data/entities.js'\nimport { getRedisUrlOrThrow, parseRedisUrl } from '@open-mercato/shared/lib/redis/connection'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('scheduler').child({ component: 'executions' })\n\n\nexport const metadata = {\n requireAuth: true,\n requireFeatures: ['scheduler.jobs.view'],\n}\n\n/**\n * GET /api/scheduler/jobs/[id]/executions\n * Fetch execution history for a schedule from BullMQ\n * \n * Returns jobs from the scheduler-execution queue filtered by scheduleId.\n * This replaces the old /api/scheduler/runs endpoint that used the database table.\n */\nexport async function GET(\n req: NextRequest,\n { params }: { params: { id: string } }\n) {\n const { translate } = await resolveTranslations()\n const auth = await getAuthFromRequest(req)\n if (!auth?.sub) {\n return NextResponse.json({ error: translate('scheduler.error.unauthorized', 'Unauthorized') }, { status: 401 })\n }\n\n const container = await createRequestContainer()\n const em = container.resolve<EntityManager>('em')\n\n const scheduleId = params.id\n\n try {\n // Verify schedule exists and user has access (with tenant/org scope filter)\n const findFilter: Record<string, unknown> = {\n id: scheduleId,\n deletedAt: null,\n }\n\n // Apply tenant isolation: scope the query to the user's tenant/org\n if (auth.tenantId) {\n findFilter.tenantId = auth.tenantId\n }\n if (auth.orgId) {\n findFilter.organizationId = auth.orgId\n }\n\n const schedule = await em.findOne(ScheduledJob, findFilter)\n\n if (!schedule) {\n return NextResponse.json({ error: translate('scheduler.error.not_found', 'Schedule not found') }, { status: 404 })\n }\n\n // System-scoped schedules (no tenantId/orgId) require super-admin. Use the\n // immutable `isSuperAdmin` flag \u2014 never compare mutable/spoofable role names.\n const isSuperAdmin = auth.isSuperAdmin === true\n if (!schedule.tenantId && !schedule.organizationId && !isSuperAdmin) {\n return NextResponse.json({ error: translate('scheduler.error.access_denied', 'Access denied') }, { status: 403 })\n }\n\n // Check if using async strategy\n const queueStrategy = process.env.QUEUE_STRATEGY || 'local'\n if (queueStrategy !== 'async') {\n return NextResponse.json({\n error: translate('scheduler.error.async_strategy_required', 'Execution history requires QUEUE_STRATEGY=async'),\n message: translate('scheduler.error.async_strategy_hint', 'Please set QUEUE_STRATEGY=async to view execution history'),\n items: [],\n }, { status: 400 })\n }\n\n // Fetch jobs from BullMQ scheduler-execution queue\n const { Queue } = await import('bullmq')\n const queue = new Queue('scheduler-execution', {\n connection: parseRedisUrl(getRedisUrlOrThrow('QUEUE')),\n })\n\n try {\n // Validate query params with Zod schema\n const queryResult = executionsQuerySchema.safeParse({\n pageSize: req.nextUrl.searchParams.get('pageSize') ?? undefined,\n })\n const limit = queryResult.success ? queryResult.data.pageSize : 20\n\n const [completed, failed, active, waiting, delayed] = await Promise.all([\n queue.getCompleted(0, limit - 1),\n queue.getFailed(0, limit - 1),\n queue.getActive(0, limit - 1),\n queue.getWaiting(0, limit - 1),\n queue.getDelayed(0, limit - 1),\n ])\n\n // Combine all jobs and filter by scheduleId\n const allJobs = [...completed, ...failed, ...active, ...waiting, ...delayed]\n type BullJobData = { payload?: { scheduleId?: string; triggerType?: string; triggeredByUserId?: string }; scheduleId?: string; triggerType?: string; triggeredByUserId?: string }\n\n const filteredJobs = allJobs\n .filter(job => {\n const data = job.data as BullJobData | undefined\n return data?.payload?.scheduleId === scheduleId || data?.scheduleId === scheduleId\n })\n .slice(0, limit)\n\n // Get state for each job (parallel)\n const jobsWithState = await Promise.all(\n filteredJobs.map(async (job) => {\n const state = await job.getState()\n const data = job.data as BullJobData | undefined\n \n return {\n id: job.id,\n scheduleId: data?.payload?.scheduleId || data?.scheduleId,\n startedAt: job.processedOn ? new Date(job.processedOn).toISOString() : new Date(job.timestamp).toISOString(),\n finishedAt: job.finishedOn ? new Date(job.finishedOn).toISOString() : null,\n status: state === 'completed' ? 'completed' : state === 'failed' ? 'failed' : state === 'active' ? 'running' : 'waiting',\n triggerType: data?.payload?.triggerType || data?.triggerType || 'scheduled',\n triggeredByUserId: data?.payload?.triggeredByUserId || data?.triggeredByUserId || null,\n errorMessage: job.failedReason || null,\n errorStack: job.stacktrace ? job.stacktrace.join('\\n') : null,\n durationMs: (job.finishedOn && job.processedOn) ? (job.finishedOn - job.processedOn) : null,\n queueJobId: job.id,\n queueName: 'scheduler-execution',\n attemptsMade: job.attemptsMade,\n result: job.returnvalue,\n }\n })\n )\n\n // Sort by startedAt descending (most recent first)\n jobsWithState.sort((a, b) => new Date(b.startedAt).getTime() - new Date(a.startedAt).getTime())\n\n return NextResponse.json({\n items: jobsWithState,\n total: jobsWithState.length,\n page: 1,\n pageSize: limit,\n })\n } finally {\n await queue.close()\n }\n\n } catch (error: unknown) {\n logger.error('Error fetching execution history', { err: error })\n return NextResponse.json(\n { error: error instanceof Error ? error.message : translate('scheduler.error.fetch_executions_failed', 'Failed to fetch execution history') },\n { status: 500 }\n )\n }\n}\n\n// Query schemas\nconst executionsQuerySchema = z.object({\n pageSize: z.coerce.number().int().min(1).max(100).default(20),\n})\n\n// Response schemas\nconst executionItemSchema = z.object({\n id: z.string(),\n scheduleId: z.string().uuid(),\n startedAt: z.string(),\n finishedAt: z.string().nullable(),\n status: z.enum(['running', 'completed', 'failed', 'waiting']),\n triggerType: z.enum(['scheduled', 'manual']),\n triggeredByUserId: z.string().uuid().nullable(),\n errorMessage: z.string().nullable(),\n errorStack: z.string().nullable(),\n durationMs: z.number().nullable(),\n queueJobId: z.string(),\n queueName: z.string(),\n attemptsMade: z.number(),\n result: z.unknown().nullable(),\n})\n\nconst executionsResponseSchema = z.object({\n items: z.array(executionItemSchema),\n total: z.number(),\n page: z.number(),\n pageSize: z.number(),\n})\n\nconst errorResponseSchema = z.object({\n error: z.string(),\n message: z.string().optional(),\n items: z.array(z.any()).optional(),\n})\n\n// OpenAPI specification\nexport const openApi: OpenApiRouteDoc = {\n tag: 'Scheduler',\n summary: 'Get execution history',\n description: 'Fetches recent execution history for a scheduled job from BullMQ.',\n methods: {\n GET: {\n operationId: 'getScheduleExecutions',\n summary: 'Get execution history for a schedule',\n description: 'Fetch recent executions from BullMQ for a scheduled job. Requires QUEUE_STRATEGY=async.',\n query: executionsQuerySchema,\n responses: [\n {\n status: 200,\n description: 'Execution history',\n schema: executionsResponseSchema,\n },\n ],\n errors: [\n { status: 400, description: 'Local strategy not supported', schema: errorResponseSchema },\n { status: 401, description: 'Unauthorized', schema: errorResponseSchema },\n { status: 403, description: 'Access denied', schema: errorResponseSchema },\n { status: 404, description: 'Schedule not found', schema: errorResponseSchema },\n ],\n },\n },\n}\n"],
5
+ "mappings": "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",
6
6
  "names": []
7
7
  }
@@ -1,7 +1,7 @@
1
1
  import { NextResponse } from "next/server";
2
2
  import { z } from "zod";
3
3
  import { getAuthFromRequest } from "@open-mercato/shared/lib/auth/server";
4
- import { getRedisUrlOrThrow } from "@open-mercato/shared/lib/redis/connection";
4
+ import { getRedisUrlOrThrow, parseRedisUrl } from "@open-mercato/shared/lib/redis/connection";
5
5
  import { getModules } from "@open-mercato/shared/lib/modules/registry";
6
6
  import { resolveTranslations } from "@open-mercato/shared/lib/i18n/server";
7
7
  import { createLogger } from "@open-mercato/shared/lib/logger";
@@ -45,7 +45,9 @@ async function GET(req, { params }) {
45
45
  }, { status: 400 });
46
46
  }
47
47
  const { Queue } = await import("bullmq");
48
- const queue = new Queue(queueName, { connection: { url: getRedisUrlOrThrow("QUEUE") } });
48
+ const queue = new Queue(queueName, {
49
+ connection: parseRedisUrl(getRedisUrlOrThrow("QUEUE"))
50
+ });
49
51
  const job = await queue.getJob(jobId);
50
52
  if (!job) {
51
53
  await queue.close();
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../../../../src/modules/scheduler/api/queue-jobs/%5BjobId%5D/route.ts"],
4
- "sourcesContent": ["import { NextRequest, NextResponse } from 'next/server'\nimport { z } from 'zod'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'\nimport { getRedisUrlOrThrow } from '@open-mercato/shared/lib/redis/connection'\nimport { getModules } from '@open-mercato/shared/lib/modules/registry'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('scheduler').child({ component: 'queue-jobs' })\n\n\nexport const metadata = {\n requireAuth: true,\n requireFeatures: ['scheduler.jobs.view'],\n}\n\n/**\n * GET /api/scheduler/queue-jobs/[jobId]\n * Fetch BullMQ job details and logs\n * \n * Query params:\n * - queue: Queue name (required)\n * \n * Note: This endpoint returns job data from BullMQ directly.\n * Tenant/org isolation is enforced at the queue level (jobs contain tenant/org IDs in their data).\n */\nexport async function GET(\n req: NextRequest,\n { params }: { params: { jobId: string } }\n) {\n const { translate } = await resolveTranslations()\n const auth = await getAuthFromRequest(req)\n if (!auth?.sub) {\n return NextResponse.json({ error: translate('scheduler.error.unauthorized', 'Unauthorized') }, { status: 401 })\n }\n\n const { jobId } = params\n\n // Validate query params with Zod schema\n const queryResult = queueJobQuerySchema.safeParse({\n queue: req.nextUrl.searchParams.get('queue') ?? undefined,\n })\n if (!queryResult.success) {\n return NextResponse.json(\n { error: translate('scheduler.error.queue_param_required', 'queue parameter required') },\n { status: 400 }\n )\n }\n const queueName = queryResult.data.queue\n\n // Validate queue name against registered module queues\n const registeredQueues = new Set(\n getModules().flatMap((m) => m.workers?.map((w) => w.queue) ?? [])\n )\n if (!registeredQueues.has(queueName)) {\n return NextResponse.json(\n { error: translate('scheduler.error.invalid_queue_name', 'Invalid queue name') },\n { status: 400 }\n )\n }\n\n try {\n // Check if using async strategy\n const queueStrategy = process.env.QUEUE_STRATEGY || 'local'\n if (queueStrategy !== 'async') {\n return NextResponse.json({\n error: translate('scheduler.error.bullmq_required', 'BullMQ job logs are only available with QUEUE_STRATEGY=async'),\n available: false,\n }, { status: 400 })\n }\n\n // Fetch job from BullMQ\n const { Queue } = await import('bullmq')\n const queue = new Queue(queueName, { connection: { url: getRedisUrlOrThrow('QUEUE') } })\n\n const job = await queue.getJob(jobId)\n\n if (!job) {\n await queue.close()\n return NextResponse.json(\n { error: translate('scheduler.error.job_not_found', 'Job not found in BullMQ (may have been removed)') },\n { status: 404 }\n )\n }\n\n // Validate tenant/org access from job data\n const jobData = job.data as Record<string, unknown> | undefined\n const jobPayload = jobData?.payload as Record<string, unknown> | undefined\n\n // Resolve tenant/org IDs from job data (may be nested in payload)\n const jobTenantId = jobData?.tenantId ?? jobPayload?.tenantId ?? null\n const jobOrgId = jobData?.organizationId ?? jobPayload?.organizationId ?? null\n\n // System-scoped jobs (no tenantId/orgId) require super-admin. Use the\n // immutable `isSuperAdmin` flag \u2014 never compare mutable/spoofable role names.\n const isSuperAdmin = auth.isSuperAdmin === true\n if (!jobTenantId && !jobOrgId && !isSuperAdmin) {\n await queue.close()\n return NextResponse.json({ error: translate('scheduler.error.forbidden', 'Forbidden') }, { status: 403 })\n }\n\n // Deny access to jobs belonging to a different tenant\n if (jobTenantId && auth.tenantId && jobTenantId !== auth.tenantId) {\n await queue.close()\n return NextResponse.json({ error: translate('scheduler.error.forbidden', 'Forbidden') }, { status: 403 })\n }\n\n // Deny access to jobs belonging to a different organization\n if (jobOrgId && auth.orgId && jobOrgId !== auth.orgId) {\n await queue.close()\n return NextResponse.json({ error: translate('scheduler.error.forbidden', 'Forbidden') }, { status: 403 })\n }\n\n // Get job state and logs\n const state = await job.getState()\n const logs = await queue.getJobLogs(jobId)\n\n await queue.close()\n\n return NextResponse.json({\n id: job.id,\n name: job.name,\n data: job.data,\n state,\n progress: job.progress,\n returnvalue: job.returnvalue,\n failedReason: job.failedReason,\n stacktrace: job.stacktrace,\n attemptsMade: job.attemptsMade,\n processedOn: job.processedOn ? new Date(job.processedOn).toISOString() : null,\n finishedOn: job.finishedOn ? new Date(job.finishedOn).toISOString() : null,\n logs: logs.logs || [],\n })\n } catch (error: unknown) {\n logger.error('Error fetching job', { err: error })\n return NextResponse.json(\n { error: error instanceof Error ? error.message : translate('scheduler.error.fetch_job_failed', 'Failed to fetch job details') },\n { status: 500 }\n )\n }\n}\n\n// Query schemas\nconst queueJobQuerySchema = z.object({\n queue: z.string(),\n})\n\n// Response schemas\nconst queueJobResponseSchema = z.object({\n id: z.string(),\n name: z.string(),\n data: z.unknown(),\n state: z.enum(['waiting', 'active', 'completed', 'failed', 'delayed', 'waiting-children']),\n progress: z.number().nullable(),\n returnvalue: z.unknown().nullable(),\n failedReason: z.string().nullable(),\n stacktrace: z.array(z.string()).nullable(),\n attemptsMade: z.number(),\n processedOn: z.string().nullable(),\n finishedOn: z.string().nullable(),\n logs: z.array(z.string()),\n})\n\nconst errorResponseSchema = z.object({\n error: z.string(),\n available: z.boolean().optional(),\n})\n\n// OpenAPI specification\nexport const openApi: OpenApiRouteDoc = {\n tag: 'Scheduler',\n summary: 'Get BullMQ job details',\n description: 'Fetches detailed information and logs for a queue job from BullMQ.',\n methods: {\n GET: {\n operationId: 'getQueueJobDetails',\n summary: 'Get BullMQ job details and logs',\n description: 'Fetch detailed information and logs for a queue job. Requires QUEUE_STRATEGY=async.',\n query: queueJobQuerySchema,\n responses: [\n {\n status: 200,\n description: 'Job details and logs',\n schema: queueJobResponseSchema,\n },\n ],\n errors: [\n { status: 400, description: 'Invalid request or local strategy not supported', schema: errorResponseSchema },\n { status: 401, description: 'Unauthorized', schema: errorResponseSchema },\n { status: 403, description: 'Access denied', schema: errorResponseSchema },\n { status: 404, description: 'Job not found', schema: errorResponseSchema },\n { status: 500, description: 'Internal server error', schema: errorResponseSchema },\n ],\n },\n },\n}\n"],
5
- "mappings": "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",
4
+ "sourcesContent": ["import { NextRequest, NextResponse } from 'next/server'\nimport { z } from 'zod'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'\nimport { getRedisUrlOrThrow, parseRedisUrl } from '@open-mercato/shared/lib/redis/connection'\nimport { getModules } from '@open-mercato/shared/lib/modules/registry'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('scheduler').child({ component: 'queue-jobs' })\n\n\nexport const metadata = {\n requireAuth: true,\n requireFeatures: ['scheduler.jobs.view'],\n}\n\n/**\n * GET /api/scheduler/queue-jobs/[jobId]\n * Fetch BullMQ job details and logs\n * \n * Query params:\n * - queue: Queue name (required)\n * \n * Note: This endpoint returns job data from BullMQ directly.\n * Tenant/org isolation is enforced at the queue level (jobs contain tenant/org IDs in their data).\n */\nexport async function GET(\n req: NextRequest,\n { params }: { params: { jobId: string } }\n) {\n const { translate } = await resolveTranslations()\n const auth = await getAuthFromRequest(req)\n if (!auth?.sub) {\n return NextResponse.json({ error: translate('scheduler.error.unauthorized', 'Unauthorized') }, { status: 401 })\n }\n\n const { jobId } = params\n\n // Validate query params with Zod schema\n const queryResult = queueJobQuerySchema.safeParse({\n queue: req.nextUrl.searchParams.get('queue') ?? undefined,\n })\n if (!queryResult.success) {\n return NextResponse.json(\n { error: translate('scheduler.error.queue_param_required', 'queue parameter required') },\n { status: 400 }\n )\n }\n const queueName = queryResult.data.queue\n\n // Validate queue name against registered module queues\n const registeredQueues = new Set(\n getModules().flatMap((m) => m.workers?.map((w) => w.queue) ?? [])\n )\n if (!registeredQueues.has(queueName)) {\n return NextResponse.json(\n { error: translate('scheduler.error.invalid_queue_name', 'Invalid queue name') },\n { status: 400 }\n )\n }\n\n try {\n // Check if using async strategy\n const queueStrategy = process.env.QUEUE_STRATEGY || 'local'\n if (queueStrategy !== 'async') {\n return NextResponse.json({\n error: translate('scheduler.error.bullmq_required', 'BullMQ job logs are only available with QUEUE_STRATEGY=async'),\n available: false,\n }, { status: 400 })\n }\n\n // Fetch job from BullMQ\n const { Queue } = await import('bullmq')\n const queue = new Queue(queueName, {\n connection: parseRedisUrl(getRedisUrlOrThrow('QUEUE')),\n })\n\n const job = await queue.getJob(jobId)\n\n if (!job) {\n await queue.close()\n return NextResponse.json(\n { error: translate('scheduler.error.job_not_found', 'Job not found in BullMQ (may have been removed)') },\n { status: 404 }\n )\n }\n\n // Validate tenant/org access from job data\n const jobData = job.data as Record<string, unknown> | undefined\n const jobPayload = jobData?.payload as Record<string, unknown> | undefined\n\n // Resolve tenant/org IDs from job data (may be nested in payload)\n const jobTenantId = jobData?.tenantId ?? jobPayload?.tenantId ?? null\n const jobOrgId = jobData?.organizationId ?? jobPayload?.organizationId ?? null\n\n // System-scoped jobs (no tenantId/orgId) require super-admin. Use the\n // immutable `isSuperAdmin` flag \u2014 never compare mutable/spoofable role names.\n const isSuperAdmin = auth.isSuperAdmin === true\n if (!jobTenantId && !jobOrgId && !isSuperAdmin) {\n await queue.close()\n return NextResponse.json({ error: translate('scheduler.error.forbidden', 'Forbidden') }, { status: 403 })\n }\n\n // Deny access to jobs belonging to a different tenant\n if (jobTenantId && auth.tenantId && jobTenantId !== auth.tenantId) {\n await queue.close()\n return NextResponse.json({ error: translate('scheduler.error.forbidden', 'Forbidden') }, { status: 403 })\n }\n\n // Deny access to jobs belonging to a different organization\n if (jobOrgId && auth.orgId && jobOrgId !== auth.orgId) {\n await queue.close()\n return NextResponse.json({ error: translate('scheduler.error.forbidden', 'Forbidden') }, { status: 403 })\n }\n\n // Get job state and logs\n const state = await job.getState()\n const logs = await queue.getJobLogs(jobId)\n\n await queue.close()\n\n return NextResponse.json({\n id: job.id,\n name: job.name,\n data: job.data,\n state,\n progress: job.progress,\n returnvalue: job.returnvalue,\n failedReason: job.failedReason,\n stacktrace: job.stacktrace,\n attemptsMade: job.attemptsMade,\n processedOn: job.processedOn ? new Date(job.processedOn).toISOString() : null,\n finishedOn: job.finishedOn ? new Date(job.finishedOn).toISOString() : null,\n logs: logs.logs || [],\n })\n } catch (error: unknown) {\n logger.error('Error fetching job', { err: error })\n return NextResponse.json(\n { error: error instanceof Error ? error.message : translate('scheduler.error.fetch_job_failed', 'Failed to fetch job details') },\n { status: 500 }\n )\n }\n}\n\n// Query schemas\nconst queueJobQuerySchema = z.object({\n queue: z.string(),\n})\n\n// Response schemas\nconst queueJobResponseSchema = z.object({\n id: z.string(),\n name: z.string(),\n data: z.unknown(),\n state: z.enum(['waiting', 'active', 'completed', 'failed', 'delayed', 'waiting-children']),\n progress: z.number().nullable(),\n returnvalue: z.unknown().nullable(),\n failedReason: z.string().nullable(),\n stacktrace: z.array(z.string()).nullable(),\n attemptsMade: z.number(),\n processedOn: z.string().nullable(),\n finishedOn: z.string().nullable(),\n logs: z.array(z.string()),\n})\n\nconst errorResponseSchema = z.object({\n error: z.string(),\n available: z.boolean().optional(),\n})\n\n// OpenAPI specification\nexport const openApi: OpenApiRouteDoc = {\n tag: 'Scheduler',\n summary: 'Get BullMQ job details',\n description: 'Fetches detailed information and logs for a queue job from BullMQ.',\n methods: {\n GET: {\n operationId: 'getQueueJobDetails',\n summary: 'Get BullMQ job details and logs',\n description: 'Fetch detailed information and logs for a queue job. Requires QUEUE_STRATEGY=async.',\n query: queueJobQuerySchema,\n responses: [\n {\n status: 200,\n description: 'Job details and logs',\n schema: queueJobResponseSchema,\n },\n ],\n errors: [\n { status: 400, description: 'Invalid request or local strategy not supported', schema: errorResponseSchema },\n { status: 401, description: 'Unauthorized', schema: errorResponseSchema },\n { status: 403, description: 'Access denied', schema: errorResponseSchema },\n { status: 404, description: 'Job not found', schema: errorResponseSchema },\n { status: 500, description: 'Internal server error', schema: errorResponseSchema },\n ],\n },\n },\n}\n"],
5
+ "mappings": "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",
6
6
  "names": []
7
7
  }
@@ -0,0 +1,157 @@
1
+ {
2
+ "scheduler.action.create": "새 일정",
3
+ "scheduler.action.delete": "삭제",
4
+ "scheduler.action.edit": "편집",
5
+ "scheduler.action.refresh": "새로고침",
6
+ "scheduler.action.trigger": "지금 실행",
7
+ "scheduler.action.view": "보기",
8
+ "scheduler.audit.create": "일정 생성",
9
+ "scheduler.audit.delete": "일정 삭제",
10
+ "scheduler.audit.update": "일정 수정",
11
+ "scheduler.confirm.delete": "이 일정을 삭제하시겠습니까?",
12
+ "scheduler.confirm.trigger": "지금 \"{name}\"을(를) 실행하시겠습니까?\n\n{targetType}이(가) 즉시 실행됩니다.",
13
+ "scheduler.create.title": "일정 생성",
14
+ "scheduler.details.configuration": "구성",
15
+ "scheduler.details.error": "오류",
16
+ "scheduler.details.executions_async_only": "실행 기록 및 수동 실행은 비동기 큐 전략(QUEUE_STRATEGY=async)이 필요합니다.",
17
+ "scheduler.details.last_run": "마지막 실행",
18
+ "scheduler.details.no_executions": "아직 실행 기록이 없습니다",
19
+ "scheduler.details.not_found": "찾을 수 없음",
20
+ "scheduler.details.payload": "페이로드",
21
+ "scheduler.details.recent_executions": "최근 실행",
22
+ "scheduler.details.required_feature": "필요한 기능",
23
+ "scheduler.details.scope": "범위",
24
+ "scheduler.details.source_module": "모듈",
25
+ "scheduler.details.source_user": "사용자 생성",
26
+ "scheduler.details.triggering": "실행 중...",
27
+ "scheduler.edit.title": "일정 편집",
28
+ "scheduler.error.access_denied": "접근이 거부되었습니다",
29
+ "scheduler.error.active_schedule_limit": "이 테넌트({max})에 대한 활성 예약 작업 제한에 도달했습니다.",
30
+ "scheduler.error.async_strategy_hint": "실행 기록을 보려면 QUEUE_STRATEGY=async를 설정하세요",
31
+ "scheduler.error.async_strategy_required": "실행 기록에는 QUEUE_STRATEGY=async가 필요합니다",
32
+ "scheduler.error.bullmq_required": "BullMQ 작업 로그는 QUEUE_STRATEGY=async에서만 사용할 수 있습니다",
33
+ "scheduler.error.delete_failed": "일정 삭제에 실패했습니다",
34
+ "scheduler.error.fetch_executions_failed": "실행 기록을 가져오지 못했습니다",
35
+ "scheduler.error.fetch_failed": "일정을 불러오지 못했습니다",
36
+ "scheduler.error.fetch_job_failed": "작업 상세 정보를 가져오지 못했습니다",
37
+ "scheduler.error.forbidden": "접근이 거부되었습니다",
38
+ "scheduler.error.invalidPayload": "잘못된 JSON 페이로드입니다",
39
+ "scheduler.error.invalid_queue_name": "잘못된 큐 이름입니다",
40
+ "scheduler.error.invalid_schedule_value": "일정 값이 잘못되었습니다.",
41
+ "scheduler.error.job_not_found": "BullMQ에서 작업을 찾을 수 없습니다 (제거되었을 수 있음)",
42
+ "scheduler.error.load_failed": "일정을 불러오지 못했습니다",
43
+ "scheduler.error.not_found": "일정을 찾을 수 없습니다",
44
+ "scheduler.error.queue_param_required": "queue 매개변수가 필요합니다",
45
+ "scheduler.error.trigger_async_hint": "실행 기록 및 수동 실행은 BullMQ(비동기 전략)에서만 사용할 수 있습니다",
46
+ "scheduler.error.trigger_async_required": "수동 실행에는 QUEUE_STRATEGY=async가 필요합니다",
47
+ "scheduler.error.trigger_failed": "일정 실행에 실패했습니다",
48
+ "scheduler.error.unauthorized": "권한이 없습니다",
49
+ "scheduler.error.update_failed": "일정 수정에 실패했습니다",
50
+ "scheduler.errors.id_required": "일정 식별자는 필수입니다.",
51
+ "scheduler.execution.actions": "작업",
52
+ "scheduler.execution.completed_message": "이 실행은 오류 없이 성공적으로 완료되었습니다.",
53
+ "scheduler.execution.details_title": "실행 상세 정보",
54
+ "scheduler.execution.duration": "소요 시간",
55
+ "scheduler.execution.error_message": "오류 메시지",
56
+ "scheduler.execution.finished_at": "완료 시각",
57
+ "scheduler.execution.na": "해당 없음",
58
+ "scheduler.execution.queue_job_id": "큐 작업 ID",
59
+ "scheduler.execution.queue_name": "큐 이름",
60
+ "scheduler.execution.run_id": "실행 ID",
61
+ "scheduler.execution.running_message": "이 실행은 현재 진행 중입니다.",
62
+ "scheduler.execution.skipped_message": "이 실행은 건너뛰어졌습니다.",
63
+ "scheduler.execution.stack_trace": "스택 추적",
64
+ "scheduler.execution.started": "시작됨",
65
+ "scheduler.execution.started_at": "시작 시각",
66
+ "scheduler.execution.status": "상태",
67
+ "scheduler.execution.trigger": "트리거",
68
+ "scheduler.execution.trigger_type": "트리거 유형",
69
+ "scheduler.execution.view_details": "상세 정보 보기",
70
+ "scheduler.execution.view_logs": "로그 보기",
71
+ "scheduler.execution_status.completed": "완료됨",
72
+ "scheduler.execution_status.failed": "실패",
73
+ "scheduler.execution_status.running": "실행 중",
74
+ "scheduler.execution_status.skipped": "건너뜀",
75
+ "scheduler.execution_status.waiting": "대기 중",
76
+ "scheduler.field.active": "활성",
77
+ "scheduler.field.description": "설명",
78
+ "scheduler.field.name": "이름",
79
+ "scheduler.field.next_run": "다음 실행",
80
+ "scheduler.field.schedule": "일정",
81
+ "scheduler.field.schedule_type": "유형",
82
+ "scheduler.field.schedule_value": "일정 값",
83
+ "scheduler.field.source": "소스",
84
+ "scheduler.field.status": "상태",
85
+ "scheduler.field.target": "대상",
86
+ "scheduler.field.timezone": "표준 시간대",
87
+ "scheduler.form.description": "설명",
88
+ "scheduler.form.disabled": "비활성화됨",
89
+ "scheduler.form.enabled": "활성화됨",
90
+ "scheduler.form.group.basic": "기본 정보",
91
+ "scheduler.form.group.schedule": "일정 구성",
92
+ "scheduler.form.group.target": "대상 구성",
93
+ "scheduler.form.is_enabled": "활성화됨",
94
+ "scheduler.form.name": "이름",
95
+ "scheduler.form.name.required": "이름은 필수입니다",
96
+ "scheduler.form.save": "변경 사항 저장",
97
+ "scheduler.form.schedule": "일정",
98
+ "scheduler.form.schedule.required": "일정은 필수입니다",
99
+ "scheduler.form.schedule_type": "일정 유형",
100
+ "scheduler.form.schedule_value": "일정 값",
101
+ "scheduler.form.schedule_value.description": "cron: cron 표현식을 사용하세요 (예: \"0 0 * * *\"). interval: \"15m\", \"2h\", \"1d\"와 같은 형식을 사용하세요 (s=초, m=분, h=시간, d=일)",
102
+ "scheduler.form.schedule_value.placeholder": "예: 0 */6 * * * 또는 15m",
103
+ "scheduler.form.scope_type": "범위",
104
+ "scheduler.form.scope_type.locked_description": "범위는 일정이 생성될 때 설정되며 이후에는 변경할 수 없습니다.",
105
+ "scheduler.form.submit": "일정 생성",
106
+ "scheduler.form.target_command": "대상 명령",
107
+ "scheduler.form.target_command.placeholder": "명령 검색...",
108
+ "scheduler.form.target_payload": "작업 인수 (JSON)",
109
+ "scheduler.form.target_payload.description": "명령이나 큐 작업에 전달할 인수가 담긴 선택적 JSON 객체입니다. 유효한 JSON 형식이어야 합니다.",
110
+ "scheduler.form.target_payload.invalid_json": "유효한 JSON이어야 합니다",
111
+ "scheduler.form.target_payload.placeholder": "{\n \"message\": \"Hello\",\n \"value\": 42\n}",
112
+ "scheduler.form.target_queue": "대상 큐",
113
+ "scheduler.form.target_queue.placeholder": "큐 검색...",
114
+ "scheduler.form.target_type": "대상 유형",
115
+ "scheduler.form.timezone": "표준 시간대",
116
+ "scheduler.form.timezone.placeholder": "표준 시간대 검색...",
117
+ "scheduler.job_logs.attempts": "시도 횟수",
118
+ "scheduler.job_logs.duration": "소요 시간",
119
+ "scheduler.job_logs.error_message": "오류 메시지",
120
+ "scheduler.job_logs.finished": "완료됨",
121
+ "scheduler.job_logs.job_id": "작업 ID",
122
+ "scheduler.job_logs.load_failed": "작업 상세 정보를 불러오지 못했습니다",
123
+ "scheduler.job_logs.no_logs": "사용 가능한 로그가 없습니다",
124
+ "scheduler.job_logs.processed": "처리됨",
125
+ "scheduler.job_logs.progress": "진행 상황",
126
+ "scheduler.job_logs.return_value": "반환 값",
127
+ "scheduler.job_logs.stack_trace": "스택 추적",
128
+ "scheduler.job_logs.state": "상태",
129
+ "scheduler.job_logs.tab_error": "오류 상세 정보",
130
+ "scheduler.job_logs.tab_logs": "로그",
131
+ "scheduler.job_logs.tab_overview": "개요",
132
+ "scheduler.job_logs.tab_payload": "페이로드",
133
+ "scheduler.job_logs.title": "큐 작업",
134
+ "scheduler.loading": "일정을 불러오는 중...",
135
+ "scheduler.module.description": "cron 표현식이나 간단한 간격으로 자동화된 예약 작업을 관리합니다.",
136
+ "scheduler.module.title": "예약된 작업",
137
+ "scheduler.nav.backToList": "예약된 작업으로 돌아가기",
138
+ "scheduler.scope.organization": "조직",
139
+ "scheduler.scope.system": "시스템",
140
+ "scheduler.scope.tenant": "테넌트",
141
+ "scheduler.search.placeholder": "일정 검색...",
142
+ "scheduler.status.disabled": "비활성화됨",
143
+ "scheduler.status.enabled": "활성화됨",
144
+ "scheduler.success.created": "일정이 성공적으로 생성되었습니다",
145
+ "scheduler.success.deleted": "일정이 성공적으로 삭제되었습니다",
146
+ "scheduler.success.disabled": "일정이 비활성화되었습니다",
147
+ "scheduler.success.enabled": "일정이 활성화되었습니다",
148
+ "scheduler.success.triggered": "일정이 성공적으로 실행되었습니다",
149
+ "scheduler.success.updated": "일정이 성공적으로 수정되었습니다",
150
+ "scheduler.target.command": "명령",
151
+ "scheduler.target.queue": "큐",
152
+ "scheduler.title": "예약된 작업",
153
+ "scheduler.trigger_type.manual": "수동",
154
+ "scheduler.trigger_type.scheduled": "예약됨",
155
+ "scheduler.type.cron": "Cron 표현식",
156
+ "scheduler.type.interval": "간단한 간격"
157
+ }
@@ -2,7 +2,7 @@ import { ScheduledJob } from "../data/entities.js";
2
2
  import { recalculateNextRun } from "../lib/nextRunCalculator.js";
3
3
  import { parseCronExpression } from "../lib/cronParser.js";
4
4
  import { resolveScheduleIntervalMs } from "../lib/intervalParser.js";
5
- import { getRedisUrlOrThrow } from "@open-mercato/shared/lib/redis/connection";
5
+ import { getRedisUrlOrThrow, parseRedisUrl } 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,7 +17,9 @@ class BullMQSchedulerService {
17
17
  if (!this.queue) {
18
18
  try {
19
19
  const { Queue } = await import("bullmq");
20
- this.queue = new Queue("scheduler-execution", { connection: { url: getRedisUrlOrThrow("QUEUE") } });
20
+ this.queue = new Queue("scheduler-execution", {
21
+ connection: parseRedisUrl(getRedisUrlOrThrow("QUEUE"))
22
+ });
21
23
  } catch {
22
24
  throw new Error("BullMQ is required for async scheduler. Install it with: npm install bullmq");
23
25
  }
@@ -27,15 +29,24 @@ class BullMQSchedulerService {
27
29
  getScheduleJobName(scheduleId) {
28
30
  return `schedule-${scheduleId}`;
29
31
  }
30
- getScheduleIdFromRepeatableJob(job) {
31
- const candidate = job.id?.startsWith("schedule-") ? job.id : job.name?.startsWith("schedule-") ? job.name : null;
32
+ getScheduleIdFromJobScheduler(job) {
33
+ const candidate = [job.key, job.id, job.name].find((value) => value?.startsWith("schedule-"));
32
34
  return candidate ? candidate.slice("schedule-".length) : null;
33
35
  }
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
+ }
34
45
  isRepeatableJobForSchedule(job, scheduleId) {
35
46
  const jobName = this.getScheduleJobName(scheduleId);
36
47
  return job.id === jobName || job.name === jobName;
37
48
  }
38
- async removeRepeatableJobsForSchedule(queue, scheduleId) {
49
+ async removeLegacyRepeatableJobs(queue, scheduleId) {
39
50
  const repeatableJobs = await queue.getRepeatableJobs?.();
40
51
  if (!repeatableJobs || typeof queue.removeRepeatableByKey !== "function") {
41
52
  return 0;
@@ -49,7 +60,7 @@ class BullMQSchedulerService {
49
60
  return removed;
50
61
  }
51
62
  /**
52
- * Register a schedule with BullMQ repeatable jobs
63
+ * Register a schedule with BullMQ Job Schedulers
53
64
  * @param schedule - The schedule to register
54
65
  * @param options - Optional configuration
55
66
  * @param options.skipNextRunUpdate - If true, skip updating nextRunAt (used when called from hooks)
@@ -73,7 +84,6 @@ class BullMQSchedulerService {
73
84
  const repeatOpts = this.buildRepeatOptions(schedule);
74
85
  const queue = await this.getQueue();
75
86
  const jobName = this.getScheduleJobName(schedule.id);
76
- await this.removeRepeatableJobsForSchedule(queue, schedule.id);
77
87
  const jobData = {
78
88
  id: jobName,
79
89
  payload: {
@@ -84,7 +94,7 @@ class BullMQSchedulerService {
84
94
  },
85
95
  createdAt: (/* @__PURE__ */ new Date()).toISOString()
86
96
  };
87
- logger.debug("Adding repeatable job", {
97
+ logger.debug("Upserting job scheduler", {
88
98
  jobName,
89
99
  scheduleId: schedule.id,
90
100
  scopeType: schedule.scopeType,
@@ -92,28 +102,36 @@ class BullMQSchedulerService {
92
102
  organizationId: schedule.organizationId,
93
103
  repeatOpts
94
104
  });
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
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);
114
129
  }
115
130
  }
116
- );
131
+ } else {
132
+ await this.removeLegacyRepeatableJobs(queue, schedule.id);
133
+ await queue.add(jobName, jobData, { repeat: repeatOpts, ...jobOptions });
134
+ }
117
135
  logger.debug("Registered schedule", {
118
136
  scheduleId: schedule.id,
119
137
  scheduleName: schedule.name,
@@ -127,12 +145,25 @@ class BullMQSchedulerService {
127
145
  }
128
146
  }
129
147
  /**
130
- * Unregister a schedule from BullMQ repeatable jobs
148
+ * Unregister a schedule from BullMQ Job Schedulers
131
149
  */
132
150
  async unregister(scheduleId) {
133
151
  try {
134
152
  const queue = await this.getQueue();
135
- const removed = await this.removeRepeatableJobsForSchedule(queue, scheduleId);
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);
136
167
  if (removed > 0) {
137
168
  logger.debug("Unregistered schedule", { scheduleId });
138
169
  } else {
@@ -151,14 +182,29 @@ class BullMQSchedulerService {
151
182
  const em = this.em().fork();
152
183
  const queue = await this.getQueue();
153
184
  logger.debug("Starting full sync");
154
- const repeatableJobs = await queue.getRepeatableJobs?.() || [];
155
185
  const bullmqScheduleIds = /* @__PURE__ */ new Set();
156
186
  const bullmqScheduleCounts = /* @__PURE__ */ new Map();
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);
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
+ }
162
208
  }
163
209
  const BATCH_SIZE = 500;
164
210
  const dbSchedules = [];
@@ -177,8 +223,8 @@ class BullMQSchedulerService {
177
223
  if (!bullmqScheduleIds.has(schedule.id)) {
178
224
  logger.debug("Registering missing schedule", { scheduleId: schedule.id, scheduleName: schedule.name });
179
225
  await this.register(schedule);
180
- } else if ((bullmqScheduleCounts.get(schedule.id) ?? 0) > 1) {
181
- logger.info("Repairing duplicate repeatable jobs", { scheduleId: schedule.id });
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 });
182
228
  await this.register(schedule);
183
229
  }
184
230
  }
@@ -212,14 +258,17 @@ class BullMQSchedulerService {
212
258
  return opts;
213
259
  }
214
260
  /**
215
- * Get list of all repeatable jobs from BullMQ
261
+ * Get list of all scheduled jobs from BullMQ
216
262
  */
217
263
  async getRepeatableJobs() {
218
264
  try {
219
265
  const queue = await this.getQueue();
220
- return await queue.getRepeatableJobs?.() || [];
266
+ if (this.supportsJobSchedulers(queue)) {
267
+ return await queue.getJobSchedulers();
268
+ }
269
+ return await queue.getRepeatableJobs?.() ?? [];
221
270
  } catch (error) {
222
- logger.error("Failed to get repeatable jobs", { err: error });
271
+ logger.error("Failed to get job schedulers", { err: error });
223
272
  return [];
224
273
  }
225
274
  }