@open-mercato/scheduler 0.9.0 → 0.9.1-develop.7462.1.94c09f158f
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.
- package/.turbo/turbo-build.log +1 -1
- package/dist/modules/scheduler/api/jobs/[id]/executions/route.js +1 -1
- package/dist/modules/scheduler/api/jobs/[id]/executions/route.js.map +2 -2
- package/dist/modules/scheduler/api/jobs/route.js +1 -1
- package/dist/modules/scheduler/api/jobs/route.js.map +2 -2
- package/dist/modules/scheduler/cli.js +28 -6
- package/dist/modules/scheduler/cli.js.map +2 -2
- package/dist/modules/scheduler/data/validators.js +5 -5
- package/dist/modules/scheduler/data/validators.js.map +2 -2
- package/dist/modules/scheduler/lib/bullmqNextRun.js +61 -0
- package/dist/modules/scheduler/lib/bullmqNextRun.js.map +7 -0
- package/dist/modules/scheduler/lib/nextRunSync.js +80 -0
- package/dist/modules/scheduler/lib/nextRunSync.js.map +7 -0
- package/dist/modules/scheduler/workers/execute-schedule.worker.js +20 -0
- package/dist/modules/scheduler/workers/execute-schedule.worker.js.map +2 -2
- package/package.json +7 -6
- package/src/modules/scheduler/__tests__/cli.run.test.ts +135 -0
- package/src/modules/scheduler/api/jobs/[id]/executions/route.ts +1 -1
- package/src/modules/scheduler/api/jobs/route.ts +1 -1
- package/src/modules/scheduler/api/trigger/__tests__/route.test.ts +15 -0
- package/src/modules/scheduler/cli.ts +33 -7
- package/src/modules/scheduler/data/__tests__/validators.test.ts +29 -0
- package/src/modules/scheduler/data/validators.ts +5 -5
- package/src/modules/scheduler/lib/__tests__/bullmqNextRun.test.ts +200 -0
- package/src/modules/scheduler/lib/__tests__/nextRunSync.test.ts +222 -0
- package/src/modules/scheduler/lib/bullmqNextRun.ts +112 -0
- package/src/modules/scheduler/lib/nextRunSync.ts +131 -0
- package/src/modules/scheduler/workers/__tests__/execute-schedule.next-run.test.ts +468 -0
- package/src/modules/scheduler/workers/__tests__/execute-schedule.worker.test.ts +4 -0
- package/src/modules/scheduler/workers/execute-schedule.worker.ts +35 -0
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
[build:scheduler] found
|
|
1
|
+
[build:scheduler] found 64 entry points
|
|
2
2
|
[build:scheduler] built successfully
|
|
@@ -107,7 +107,7 @@ const executionsQuerySchema = z.object({
|
|
|
107
107
|
});
|
|
108
108
|
const executionItemSchema = z.object({
|
|
109
109
|
id: z.string(),
|
|
110
|
-
scheduleId: z.
|
|
110
|
+
scheduleId: z.guid(),
|
|
111
111
|
startedAt: z.string(),
|
|
112
112
|
finishedAt: z.string().nullable(),
|
|
113
113
|
status: z.enum(["running", "completed", "failed", "waiting"]),
|
|
@@ -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 { resolveScheduleAccess } from '../../../../lib/scheduleAccess.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 // Load by id alone, then apply isolation to the loaded row. Folding the actor's\n // tenant/org into the lookup would make every system-scoped schedule unmatchable.\n const schedule = await em.findOne(ScheduledJob, { id: scheduleId, deletedAt: null })\n\n if (!schedule) {\n return NextResponse.json({ error: translate('scheduler.error.not_found', 'Schedule not found') }, { status: 404 })\n }\n\n const access = resolveScheduleAccess(schedule, auth)\n if (access === 'not_found') {\n return NextResponse.json({ error: translate('scheduler.error.not_found', 'Schedule not found') }, { status: 404 })\n }\n if (access === 'forbidden') {\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.
|
|
5
|
-
"mappings": "AAAA,SAAsB,oBAAoB;AAC1C,SAAS,SAAS;AAClB,SAAS,0BAA0B;AACnC,SAAS,8BAA8B;AAGvC,SAAS,oBAAoB;AAC7B,SAAS,6BAA6B;AACtC,SAAS,oBAAoB,qBAAqB;AAClD,SAAS,2BAA2B;AACpC,SAAS,oBAAoB;AAE7B,MAAM,SAAS,aAAa,WAAW,EAAE,MAAM,EAAE,WAAW,aAAa,CAAC;AAGnE,MAAM,WAAW;AAAA,EACtB,aAAa;AAAA,EACb,iBAAiB,CAAC,qBAAqB;AACzC;AASA,eAAsB,IACpB,KACA,EAAE,OAAO,GACT;AACA,QAAM,EAAE,UAAU,IAAI,MAAM,oBAAoB;AAChD,QAAM,OAAO,MAAM,mBAAmB,GAAG;AACzC,MAAI,CAAC,MAAM,KAAK;AACd,WAAO,aAAa,KAAK,EAAE,OAAO,UAAU,gCAAgC,cAAc,EAAE,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EAChH;AAEA,QAAM,YAAY,MAAM,uBAAuB;AAC/C,QAAM,KAAK,UAAU,QAAuB,IAAI;AAEhD,QAAM,aAAa,OAAO;AAE1B,MAAI;AAGF,UAAM,WAAW,MAAM,GAAG,QAAQ,cAAc,EAAE,IAAI,YAAY,WAAW,KAAK,CAAC;AAEnF,QAAI,CAAC,UAAU;AACb,aAAO,aAAa,KAAK,EAAE,OAAO,UAAU,6BAA6B,oBAAoB,EAAE,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,IACnH;AAEA,UAAM,SAAS,sBAAsB,UAAU,IAAI;AACnD,QAAI,WAAW,aAAa;AAC1B,aAAO,aAAa,KAAK,EAAE,OAAO,UAAU,6BAA6B,oBAAoB,EAAE,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,IACnH;AACA,QAAI,WAAW,aAAa;AAC1B,aAAO,aAAa,KAAK,EAAE,OAAO,UAAU,iCAAiC,eAAe,EAAE,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,IAClH;AAGA,UAAM,gBAAgB,QAAQ,IAAI,kBAAkB;AACpD,QAAI,kBAAkB,SAAS;AAC7B,aAAO,aAAa,KAAK;AAAA,QACvB,OAAO,UAAU,2CAA2C,iDAAiD;AAAA,QAC7G,SAAS,UAAU,uCAAuC,2DAA2D;AAAA,QACrH,OAAO,CAAC;AAAA,MACV,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,IACpB;AAGA,UAAM,EAAE,MAAM,IAAI,MAAM,OAAO,QAAQ;AACvC,UAAM,QAAQ,IAAI,MAAM,uBAAuB;AAAA,MAC7C,YAAY,cAAc,mBAAmB,OAAO,CAAC;AAAA,IACvD,CAAC;AAED,QAAI;AAEF,YAAM,cAAc,sBAAsB,UAAU;AAAA,QAClD,UAAU,IAAI,QAAQ,aAAa,IAAI,UAAU,KAAK;AAAA,MACxD,CAAC;AACD,YAAM,QAAQ,YAAY,UAAU,YAAY,KAAK,WAAW;AAEhE,YAAM,CAAC,WAAW,QAAQ,QAAQ,SAAS,OAAO,IAAI,MAAM,QAAQ,IAAI;AAAA,QACtE,MAAM,aAAa,GAAG,QAAQ,CAAC;AAAA,QAC/B,MAAM,UAAU,GAAG,QAAQ,CAAC;AAAA,QAC5B,MAAM,UAAU,GAAG,QAAQ,CAAC;AAAA,QAC5B,MAAM,WAAW,GAAG,QAAQ,CAAC;AAAA,QAC7B,MAAM,WAAW,GAAG,QAAQ,CAAC;AAAA,MAC/B,CAAC;AAGD,YAAM,UAAU,CAAC,GAAG,WAAW,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,OAAO;AAG3E,YAAM,eAAe,QAClB,OAAO,SAAO;AACb,cAAM,OAAO,IAAI;AACjB,eAAO,MAAM,SAAS,eAAe,cAAc,MAAM,eAAe;AAAA,MAC1E,CAAC,EACA,MAAM,GAAG,KAAK;AAGjB,YAAM,gBAAgB,MAAM,QAAQ;AAAA,QAClC,aAAa,IAAI,OAAO,QAAQ;AAC9B,gBAAM,QAAQ,MAAM,IAAI,SAAS;AACjC,gBAAM,OAAO,IAAI;AAEjB,iBAAO;AAAA,YACL,IAAI,IAAI;AAAA,YACR,YAAY,MAAM,SAAS,cAAc,MAAM;AAAA,YAC/C,WAAW,IAAI,cAAc,IAAI,KAAK,IAAI,WAAW,EAAE,YAAY,IAAI,IAAI,KAAK,IAAI,SAAS,EAAE,YAAY;AAAA,YAC3G,YAAY,IAAI,aAAa,IAAI,KAAK,IAAI,UAAU,EAAE,YAAY,IAAI;AAAA,YACtE,QAAQ,UAAU,cAAc,cAAc,UAAU,WAAW,WAAW,UAAU,WAAW,YAAY;AAAA,YAC/G,aAAa,MAAM,SAAS,eAAe,MAAM,eAAe;AAAA,YAChE,mBAAmB,MAAM,SAAS,qBAAqB,MAAM,qBAAqB;AAAA,YAClF,cAAc,IAAI,gBAAgB;AAAA,YAClC,YAAY,IAAI,aAAa,IAAI,WAAW,KAAK,IAAI,IAAI;AAAA,YACzD,YAAa,IAAI,cAAc,IAAI,cAAgB,IAAI,aAAa,IAAI,cAAe;AAAA,YACvF,YAAY,IAAI;AAAA,YAChB,WAAW;AAAA,YACX,cAAc,IAAI;AAAA,YAClB,QAAQ,IAAI;AAAA,UACd;AAAA,QACF,CAAC;AAAA,MACH;AAGA,oBAAc,KAAK,CAAC,GAAG,MAAM,IAAI,KAAK,EAAE,SAAS,EAAE,QAAQ,IAAI,IAAI,KAAK,EAAE,SAAS,EAAE,QAAQ,CAAC;AAE9F,aAAO,aAAa,KAAK;AAAA,QACvB,OAAO;AAAA,QACP,OAAO,cAAc;AAAA,QACrB,MAAM;AAAA,QACN,UAAU;AAAA,MACZ,CAAC;AAAA,IACH,UAAE;AACA,YAAM,MAAM,MAAM;AAAA,IACpB;AAAA,EAEF,SAAS,OAAgB;AACvB,WAAO,MAAM,oCAAoC,EAAE,KAAK,MAAM,CAAC;AAC/D,WAAO,aAAa;AAAA,MAClB,EAAE,OAAO,iBAAiB,QAAQ,MAAM,UAAU,UAAU,2CAA2C,mCAAmC,EAAE;AAAA,MAC5I,EAAE,QAAQ,IAAI;AAAA,IAChB;AAAA,EACF;AACF;AAGA,MAAM,wBAAwB,EAAE,OAAO;AAAA,EACrC,UAAU,EAAE,OAAO,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,EAAE,QAAQ,EAAE;AAC9D,CAAC;AAGD,MAAM,sBAAsB,EAAE,OAAO;AAAA,EACnC,IAAI,EAAE,OAAO;AAAA,EACb,YAAY,EAAE,
|
|
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 { resolveScheduleAccess } from '../../../../lib/scheduleAccess.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 // Load by id alone, then apply isolation to the loaded row. Folding the actor's\n // tenant/org into the lookup would make every system-scoped schedule unmatchable.\n const schedule = await em.findOne(ScheduledJob, { id: scheduleId, deletedAt: null })\n\n if (!schedule) {\n return NextResponse.json({ error: translate('scheduler.error.not_found', 'Schedule not found') }, { status: 404 })\n }\n\n const access = resolveScheduleAccess(schedule, auth)\n if (access === 'not_found') {\n return NextResponse.json({ error: translate('scheduler.error.not_found', 'Schedule not found') }, { status: 404 })\n }\n if (access === 'forbidden') {\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.guid(),\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
|
}
|
|
@@ -155,7 +155,7 @@ const crud = makeCrudRoute({
|
|
|
155
155
|
});
|
|
156
156
|
const { GET, POST, PUT, DELETE } = crud;
|
|
157
157
|
const scheduledJobListItemSchema = z.object({
|
|
158
|
-
id: z.
|
|
158
|
+
id: z.guid(),
|
|
159
159
|
name: z.string(),
|
|
160
160
|
description: z.string().nullable(),
|
|
161
161
|
scopeType: z.enum(["system", "organization", "tenant"]),
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/modules/scheduler/api/jobs/route.ts"],
|
|
4
|
-
"sourcesContent": ["import { z } from 'zod'\nimport { makeCrudRoute } from '@open-mercato/shared/lib/crud/factory'\nimport { resolveCrudRecordId } from '@open-mercato/shared/lib/api/scoped'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'\nimport { ScheduledJob } from '../../data/entities.js'\nimport {\n scheduleCreateSchema,\n scheduleUpdateSchema,\n scheduleDeleteSchema,\n scheduleListQuerySchema,\n} from '../../data/validators.js'\nimport { buildSchedulerJobsFilters } from './buildFilters.js'\nimport {\n createSchedulerCrudOpenApi,\n createPagedListResponseSchema,\n defaultOkResponseSchema,\n} from '../openapi.js'\n\nconst rawBodySchema = z.object({}).passthrough()\n\nconst routeMetadata = {\n GET: { requireAuth: true, requireFeatures: ['scheduler.jobs.view'] },\n POST: { requireAuth: true, requireFeatures: ['scheduler.jobs.manage'] },\n PUT: { requireAuth: true, requireFeatures: ['scheduler.jobs.manage'] },\n DELETE: { requireAuth: true, requireFeatures: ['scheduler.jobs.manage'] },\n}\n\nexport const metadata = routeMetadata\n\nconst crud = makeCrudRoute({\n metadata: routeMetadata,\n orm: {\n entity: ScheduledJob,\n idField: 'id',\n tenantField: 'tenantId',\n softDeleteField: 'deletedAt',\n },\n indexer: { entityType: 'scheduler:scheduled_job' },\n list: {\n entityId: 'scheduler:scheduled_job',\n schema: scheduleListQuerySchema,\n fields: [\n 'id',\n 'name',\n 'description',\n 'scope_type',\n 'organization_id',\n 'tenant_id',\n 'schedule_type',\n 'schedule_value',\n 'timezone',\n 'target_type',\n 'target_queue',\n 'target_command',\n 'target_payload',\n 'require_feature',\n 'is_enabled',\n 'last_run_at',\n 'next_run_at',\n 'source_type',\n 'source_module',\n 'created_at',\n 'updated_at',\n ],\n sortFieldMap: {\n name: 'name',\n nextRunAt: 'next_run_at',\n lastRunAt: 'last_run_at',\n createdAt: 'created_at',\n },\n omitAutomaticTenantOrgScope: true,\n transformItem: (item: Record<string, unknown>) => {\n if (!item) return item\n return {\n id: item.id,\n name: item.name,\n description: item.description,\n scopeType: item.scope_type,\n organizationId: item.organization_id,\n tenantId: item.tenant_id,\n scheduleType: item.schedule_type,\n scheduleValue: item.schedule_value,\n timezone: item.timezone,\n targetType: item.target_type,\n targetQueue: item.target_queue,\n targetCommand: item.target_command,\n targetPayload: item.target_payload,\n requireFeature: item.require_feature,\n isEnabled: item.is_enabled,\n lastRunAt: item.last_run_at,\n nextRunAt: item.next_run_at,\n sourceType: item.source_type,\n sourceModule: item.source_module,\n createdAt: item.created_at,\n updatedAt: item.updated_at,\n }\n },\n buildFilters: buildSchedulerJobsFilters,\n },\n actions: {\n create: {\n commandId: 'scheduler.jobs.create',\n schema: rawBodySchema,\n mapInput: async ({ raw, ctx }) => {\n // Auto-populate organizationId and tenantId based on scopeType\n const scopeType = raw.scopeType\n let organizationId = raw.organizationId\n let tenantId = raw.tenantId\n \n if (scopeType === 'system') {\n // System scope requires super-admin. Use the immutable `isSuperAdmin`\n // flag (derived from RoleAcl/UserAcl) \u2014 never compare role names, which\n // are tenant-mutable and spoofable.\n if (ctx.auth?.isSuperAdmin !== true) {\n throw new CrudHttpError(403, { error: 'System-scoped schedules require superadmin privileges' })\n }\n // System scope: no org/tenant\n organizationId = null\n tenantId = null\n } else if (scopeType === 'organization') {\n // Organization scope: use auth context (orgId and tenantId)\n organizationId = ctx.auth?.orgId ?? null\n tenantId = ctx.auth?.tenantId ?? null\n } else if (scopeType === 'tenant') {\n // Tenant scope: use auth context tenantId only\n organizationId = null\n tenantId = ctx.auth?.tenantId ?? null\n }\n \n const parsed = scheduleCreateSchema.parse({\n ...raw,\n organizationId,\n tenantId,\n })\n return parsed\n },\n response: ({ result }) => ({\n id: result?.id ?? null,\n }),\n status: 201,\n },\n update: {\n commandId: 'scheduler.jobs.update',\n schema: rawBodySchema,\n mapInput: async ({ raw }) => {\n const parsed = scheduleUpdateSchema.parse(raw)\n return parsed\n },\n response: () => ({ ok: true }),\n },\n delete: {\n commandId: 'scheduler.jobs.delete',\n schema: rawBodySchema,\n mapInput: async ({ parsed, ctx }) => {\n const { translate } = await resolveTranslations()\n const id = resolveCrudRecordId(parsed, ctx, translate)\n if (!id) {\n throw new CrudHttpError(400, { \n error: translate('scheduler.errors.id_required', 'Schedule id is required') \n })\n }\n return { id }\n },\n response: () => ({ ok: true }),\n },\n },\n})\n\nexport const { GET, POST, PUT, DELETE } = crud\n\n// Response schemas\nconst scheduledJobListItemSchema = z.object({\n id: z.
|
|
5
|
-
"mappings": "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
|
|
4
|
+
"sourcesContent": ["import { z } from 'zod'\nimport { makeCrudRoute } from '@open-mercato/shared/lib/crud/factory'\nimport { resolveCrudRecordId } from '@open-mercato/shared/lib/api/scoped'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'\nimport { ScheduledJob } from '../../data/entities.js'\nimport {\n scheduleCreateSchema,\n scheduleUpdateSchema,\n scheduleDeleteSchema,\n scheduleListQuerySchema,\n} from '../../data/validators.js'\nimport { buildSchedulerJobsFilters } from './buildFilters.js'\nimport {\n createSchedulerCrudOpenApi,\n createPagedListResponseSchema,\n defaultOkResponseSchema,\n} from '../openapi.js'\n\nconst rawBodySchema = z.object({}).passthrough()\n\nconst routeMetadata = {\n GET: { requireAuth: true, requireFeatures: ['scheduler.jobs.view'] },\n POST: { requireAuth: true, requireFeatures: ['scheduler.jobs.manage'] },\n PUT: { requireAuth: true, requireFeatures: ['scheduler.jobs.manage'] },\n DELETE: { requireAuth: true, requireFeatures: ['scheduler.jobs.manage'] },\n}\n\nexport const metadata = routeMetadata\n\nconst crud = makeCrudRoute({\n metadata: routeMetadata,\n orm: {\n entity: ScheduledJob,\n idField: 'id',\n tenantField: 'tenantId',\n softDeleteField: 'deletedAt',\n },\n indexer: { entityType: 'scheduler:scheduled_job' },\n list: {\n entityId: 'scheduler:scheduled_job',\n schema: scheduleListQuerySchema,\n fields: [\n 'id',\n 'name',\n 'description',\n 'scope_type',\n 'organization_id',\n 'tenant_id',\n 'schedule_type',\n 'schedule_value',\n 'timezone',\n 'target_type',\n 'target_queue',\n 'target_command',\n 'target_payload',\n 'require_feature',\n 'is_enabled',\n 'last_run_at',\n 'next_run_at',\n 'source_type',\n 'source_module',\n 'created_at',\n 'updated_at',\n ],\n sortFieldMap: {\n name: 'name',\n nextRunAt: 'next_run_at',\n lastRunAt: 'last_run_at',\n createdAt: 'created_at',\n },\n omitAutomaticTenantOrgScope: true,\n transformItem: (item: Record<string, unknown>) => {\n if (!item) return item\n return {\n id: item.id,\n name: item.name,\n description: item.description,\n scopeType: item.scope_type,\n organizationId: item.organization_id,\n tenantId: item.tenant_id,\n scheduleType: item.schedule_type,\n scheduleValue: item.schedule_value,\n timezone: item.timezone,\n targetType: item.target_type,\n targetQueue: item.target_queue,\n targetCommand: item.target_command,\n targetPayload: item.target_payload,\n requireFeature: item.require_feature,\n isEnabled: item.is_enabled,\n lastRunAt: item.last_run_at,\n nextRunAt: item.next_run_at,\n sourceType: item.source_type,\n sourceModule: item.source_module,\n createdAt: item.created_at,\n updatedAt: item.updated_at,\n }\n },\n buildFilters: buildSchedulerJobsFilters,\n },\n actions: {\n create: {\n commandId: 'scheduler.jobs.create',\n schema: rawBodySchema,\n mapInput: async ({ raw, ctx }) => {\n // Auto-populate organizationId and tenantId based on scopeType\n const scopeType = raw.scopeType\n let organizationId = raw.organizationId\n let tenantId = raw.tenantId\n \n if (scopeType === 'system') {\n // System scope requires super-admin. Use the immutable `isSuperAdmin`\n // flag (derived from RoleAcl/UserAcl) \u2014 never compare role names, which\n // are tenant-mutable and spoofable.\n if (ctx.auth?.isSuperAdmin !== true) {\n throw new CrudHttpError(403, { error: 'System-scoped schedules require superadmin privileges' })\n }\n // System scope: no org/tenant\n organizationId = null\n tenantId = null\n } else if (scopeType === 'organization') {\n // Organization scope: use auth context (orgId and tenantId)\n organizationId = ctx.auth?.orgId ?? null\n tenantId = ctx.auth?.tenantId ?? null\n } else if (scopeType === 'tenant') {\n // Tenant scope: use auth context tenantId only\n organizationId = null\n tenantId = ctx.auth?.tenantId ?? null\n }\n \n const parsed = scheduleCreateSchema.parse({\n ...raw,\n organizationId,\n tenantId,\n })\n return parsed\n },\n response: ({ result }) => ({\n id: result?.id ?? null,\n }),\n status: 201,\n },\n update: {\n commandId: 'scheduler.jobs.update',\n schema: rawBodySchema,\n mapInput: async ({ raw }) => {\n const parsed = scheduleUpdateSchema.parse(raw)\n return parsed\n },\n response: () => ({ ok: true }),\n },\n delete: {\n commandId: 'scheduler.jobs.delete',\n schema: rawBodySchema,\n mapInput: async ({ parsed, ctx }) => {\n const { translate } = await resolveTranslations()\n const id = resolveCrudRecordId(parsed, ctx, translate)\n if (!id) {\n throw new CrudHttpError(400, { \n error: translate('scheduler.errors.id_required', 'Schedule id is required') \n })\n }\n return { id }\n },\n response: () => ({ ok: true }),\n },\n },\n})\n\nexport const { GET, POST, PUT, DELETE } = crud\n\n// Response schemas\nconst scheduledJobListItemSchema = z.object({\n id: z.guid(),\n name: z.string(),\n description: z.string().nullable(),\n scopeType: z.enum(['system', 'organization', 'tenant']),\n organizationId: z.string().uuid().nullable(),\n tenantId: z.string().uuid().nullable(),\n scheduleType: z.enum(['cron', 'interval']),\n scheduleValue: z.string(),\n timezone: z.string(),\n targetType: z.enum(['queue', 'command']),\n targetQueue: z.string().nullable(),\n targetCommand: z.string().nullable(),\n targetPayload: z.record(z.string(), z.unknown()).nullable(),\n requireFeature: z.string().nullable(),\n isEnabled: z.boolean(),\n lastRunAt: z.string().nullable(),\n nextRunAt: z.string().nullable(),\n sourceType: z.enum(['user', 'module']),\n sourceModule: z.string().nullable(),\n createdAt: z.string(),\n updatedAt: z.string(),\n})\n\n// OpenAPI specification\nexport const openApi = createSchedulerCrudOpenApi({\n resourceName: 'ScheduledJob',\n pluralName: 'ScheduledJobs',\n querySchema: scheduleListQuerySchema,\n listResponseSchema: createPagedListResponseSchema(scheduledJobListItemSchema),\n create: {\n schema: scheduleCreateSchema,\n description: 'Creates a new scheduled job with cron or interval-based scheduling.',\n },\n update: {\n schema: scheduleUpdateSchema,\n responseSchema: defaultOkResponseSchema,\n description: 'Updates an existing scheduled job by ID.',\n },\n del: {\n schema: scheduleDeleteSchema,\n responseSchema: defaultOkResponseSchema,\n description: 'Deletes a scheduled job by ID.',\n },\n})\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -2,6 +2,8 @@ import { createRequestContainer } from "@open-mercato/shared/lib/di/container";
|
|
|
2
2
|
import { ScheduledJob } from "./data/entities.js";
|
|
3
3
|
import { parseBooleanToken } from "@open-mercato/shared/lib/boolean";
|
|
4
4
|
import { auditSchedulerModuleQueueRows } from "./lib/safeQueueTargets.js";
|
|
5
|
+
import { createQueue } from "@open-mercato/queue";
|
|
6
|
+
import { getRedisUrlOrThrow } from "@open-mercato/shared/lib/redis/connection";
|
|
5
7
|
const writeLine = (text = "") => {
|
|
6
8
|
process.stdout.write(`${text}
|
|
7
9
|
`);
|
|
@@ -95,14 +97,15 @@ const runCommand = {
|
|
|
95
97
|
const scheduleId = rest[0];
|
|
96
98
|
if (!scheduleId) {
|
|
97
99
|
writeErrorLine("Usage: mercato scheduler run <schedule-id>");
|
|
100
|
+
process.exitCode = 1;
|
|
98
101
|
return;
|
|
99
102
|
}
|
|
100
103
|
const { resolve } = await createRequestContainer();
|
|
101
104
|
const em = resolve("em");
|
|
102
|
-
const queueService = resolve("queueService");
|
|
103
105
|
const job = await em.findOne(ScheduledJob, { id: scheduleId, deletedAt: null });
|
|
104
106
|
if (!job) {
|
|
105
107
|
writeErrorLine(`Schedule not found: ${scheduleId}`);
|
|
108
|
+
process.exitCode = 1;
|
|
106
109
|
return;
|
|
107
110
|
}
|
|
108
111
|
writeLine(`
|
|
@@ -113,15 +116,34 @@ const runCommand = {
|
|
|
113
116
|
writeLine(` Schedule: ${job.scheduleValue}`);
|
|
114
117
|
writeLine(` Target: ${job.targetType === "queue" ? job.targetQueue : job.targetCommand}`);
|
|
115
118
|
writeLine("");
|
|
119
|
+
if ((process.env.QUEUE_STRATEGY || "local") !== "async") {
|
|
120
|
+
throw new Error(
|
|
121
|
+
"Manual trigger requires QUEUE_STRATEGY=async (with the local strategy due schedules run via `mercato scheduler start`)"
|
|
122
|
+
);
|
|
123
|
+
}
|
|
124
|
+
const payload = {
|
|
125
|
+
scheduleId: job.id,
|
|
126
|
+
tenantId: job.tenantId,
|
|
127
|
+
organizationId: job.organizationId,
|
|
128
|
+
scopeType: job.scopeType,
|
|
129
|
+
triggerType: "manual",
|
|
130
|
+
triggeredByUserId: null
|
|
131
|
+
};
|
|
132
|
+
let executionQueue = null;
|
|
116
133
|
try {
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
134
|
+
executionQueue = createQueue("scheduler-execution", "async", {
|
|
135
|
+
connection: { url: getRedisUrlOrThrow("QUEUE") }
|
|
136
|
+
});
|
|
137
|
+
const queueJobId = await executionQueue.enqueue(payload);
|
|
138
|
+
writeLine(`\u2713 Job successfully triggered via scheduler-execution queue (job ${queueJobId})`);
|
|
120
139
|
writeLine(` The worker will pick it up and enqueue to: ${job.targetType === "queue" ? job.targetQueue : job.targetCommand}`);
|
|
121
140
|
writeLine("\u2713 Manual trigger completed\n");
|
|
122
141
|
} catch (error) {
|
|
123
|
-
|
|
124
|
-
|
|
142
|
+
throw new Error(`Failed to trigger job: ${error instanceof Error ? error.message : String(error)}`);
|
|
143
|
+
} finally {
|
|
144
|
+
await executionQueue?.close().catch((closeError) => {
|
|
145
|
+
writeErrorLine(`Failed to close scheduler execution queue: ${closeError instanceof Error ? closeError.message : String(closeError)}`);
|
|
146
|
+
});
|
|
125
147
|
}
|
|
126
148
|
}
|
|
127
149
|
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/modules/scheduler/cli.ts"],
|
|
4
|
-
"sourcesContent": ["import type { ModuleCli } from '@open-mercato/shared/modules/registry'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport type { EntityManager } from '@mikro-orm/core'\nimport { ScheduledJob } from './data/entities.js'\nimport { parseBooleanToken } from '@open-mercato/shared/lib/boolean'\nimport { auditSchedulerModuleQueueRows } from './lib/safeQueueTargets'\n\nconst writeLine = (text = '') => {\n process.stdout.write(`${text}\\n`)\n}\n\nconst writeErrorLine = (text: string) => {\n process.stderr.write(`${text}\\n`)\n}\n\nfunction parseArgs(rest: string[]): Record<string, string> {\n const args: Record<string, string> = {}\n for (let i = 0; i < rest.length; i += 2) {\n const key = rest[i]?.replace(/^--/, '')\n const value = rest[i + 1]\n if (key) args[key] = value ?? ''\n }\n return args\n}\n\nconst listCommand: ModuleCli = {\n command: 'list',\n async run(rest) {\n const args = parseArgs(rest)\n const { resolve } = await createRequestContainer()\n const em = resolve('em') as EntityManager\n\n const where: Record<string, unknown> = { deletedAt: null }\n\n // Filter by tenant if provided\n if (args.tenant || args.tenantId) {\n where.tenantId = args.tenant || args.tenantId\n }\n\n // Filter by scope type if provided\n if (args.scope || args.scopeType) {\n where.scopeType = args.scope || args.scopeType\n }\n\n // Filter by enabled status if provided\n if (args.enabled) {\n const parsed = parseBooleanToken(args.enabled)\n if (parsed !== null) {\n where.isEnabled = parsed\n }\n }\n\n const jobs = await em.find(ScheduledJob, where, {\n orderBy: { isEnabled: 'DESC', name: 'ASC' },\n })\n\n if (jobs.length === 0) {\n writeLine('No scheduled jobs found.')\n return\n }\n\n writeLine(`\\nFound ${jobs.length} scheduled job(s):\\n`)\n writeLine('ID'.padEnd(38) + 'Name'.padEnd(35) + 'Type'.padEnd(12) + 'Schedule'.padEnd(20) + 'Status'.padEnd(10) + 'Next Run')\n writeLine('-'.repeat(140))\n\n for (const job of jobs) {\n const id = String(job.id).padEnd(38)\n const name = (job.name || '').substring(0, 33).padEnd(35)\n const type = job.scheduleType.padEnd(12)\n const schedule = (job.scheduleValue || '').substring(0, 18).padEnd(20)\n const status = (job.isEnabled ? '\u2713 Enabled' : '\u2717 Disabled').padEnd(10)\n const nextRun = job.nextRunAt ? new Date(job.nextRunAt).toISOString() : 'N/A'\n writeLine(`${id}${name}${type}${schedule}${status}${nextRun}`)\n }\n\n writeLine('')\n },\n}\n\nconst statusCommand: ModuleCli = {\n command: 'status',\n async run() {\n const { resolve } = await createRequestContainer()\n const em = resolve('em') as EntityManager\n\n const totalCount = await em.count(ScheduledJob, { deletedAt: null })\n const enabledCount = await em.count(ScheduledJob, { isEnabled: true, deletedAt: null })\n const dueCount = await em.count(ScheduledJob, {\n isEnabled: true,\n deletedAt: null,\n nextRunAt: { $lte: new Date() },\n })\n\n const queueStrategy = process.env.QUEUE_STRATEGY || 'local'\n\n writeLine('\\n\uD83D\uDCCA Scheduler Status\\n')\n writeLine(`Strategy: ${queueStrategy === 'async' ? 'BullMQ (async)' : 'Local (polling)'}`)\n \n if (queueStrategy === 'local') {\n const pollInterval = parseInt(process.env.SCHEDULER_POLL_INTERVAL_MS || '30000', 10)\n writeLine(`Poll Interval: ${Math.round(pollInterval / 1000)}s`)\n }\n \n writeLine('')\n writeLine('Schedules:')\n writeLine(` Total: ${totalCount}`)\n writeLine(` Enabled: ${enabledCount}`)\n writeLine(` Due Now: ${dueCount}`)\n writeLine('')\n },\n}\n\nconst runCommand: ModuleCli = {\n command: 'run',\n async run(rest) {\n const scheduleId = rest[0]\n if (!scheduleId) {\n writeErrorLine('Usage: mercato scheduler run <schedule-id>')\n return\n }\n\n const { resolve } = await createRequestContainer()\n const em = resolve('em') as EntityManager\n const queueService = resolve('queueService') as { getQueue(name: string): { add(name: string, data: unknown): Promise<unknown> } }\n\n const job = await em.findOne(ScheduledJob, { id: scheduleId, deletedAt: null })\n if (!job) {\n writeErrorLine(`Schedule not found: ${scheduleId}`)\n return\n }\n\n writeLine(`\\n\uD83D\uDE80 Manually triggering schedule: ${job.name}\\n`)\n writeLine(` ID: ${job.id}`)\n writeLine(` Type: ${job.scheduleType}`)\n writeLine(` Schedule: ${job.scheduleValue}`)\n writeLine(` Target: ${job.targetType === 'queue' ? job.targetQueue : job.targetCommand}`)\n writeLine('')\n\n try {\n // Manually enqueue the job (triggering the scheduler-execution worker)\n const schedulerQueue = queueService.getQueue('scheduler-execution')\n await schedulerQueue.add('execute-schedule', { scheduleId: job.id })\n\n writeLine('\u2713 Job successfully triggered via scheduler-execution queue')\n writeLine(` The worker will pick it up and enqueue to: ${job.targetType === 'queue' ? job.targetQueue : job.targetCommand}`)\n writeLine('\u2713 Manual trigger completed\\n')\n } catch (error: unknown) {\n writeErrorLine(`\u2717 Failed to trigger job: ${error instanceof Error ? error.message : String(error)}`)\n process.exit(1)\n }\n },\n}\n\nconst startCommand: ModuleCli = {\n command: 'start',\n async run() {\n const { resolve } = await createRequestContainer()\n const queueStrategy = process.env.QUEUE_STRATEGY || 'local'\n\n writeLine(`\uD83D\uDE80 Starting scheduler (strategy: ${queueStrategy})...\\n`)\n\n if (queueStrategy === 'async') {\n // BullMQ strategy: Sync schedules with BullMQ repeatable jobs\n try {\n const bullmqService = resolve('bullmqSchedulerService') as { syncAll(): Promise<void> } | undefined\n \n if (!bullmqService) {\n writeErrorLine('\u274C BullMQSchedulerService not available.')\n writeErrorLine(' Set QUEUE_STRATEGY=async and configure REDIS_URL.')\n process.exit(1)\n }\n\n // Sync all enabled schedules with BullMQ\n await bullmqService.syncAll()\n\n writeLine('\u2713 Scheduler sync completed')\n writeLine('')\n writeLine('BullMQ is managing all schedules.')\n writeLine('Start workers to process jobs:')\n writeLine(' yarn mercato worker:start')\n writeLine('')\n } catch (error: unknown) {\n writeErrorLine(`\u274C Failed to sync schedules: ${error instanceof Error ? error.message : String(error)}`)\n process.exit(1)\n }\n } else {\n // Local strategy: Start polling engine\n try {\n const localService = resolve('localSchedulerService') as { start(): Promise<void>; stop(): Promise<void> } | undefined\n \n if (!localService) {\n writeErrorLine('\u274C LocalSchedulerService not available.')\n writeErrorLine(' This should not happen in local mode.')\n process.exit(1)\n }\n\n const pollInterval = parseInt(process.env.SCHEDULER_POLL_INTERVAL_MS || '30000', 10)\n\n // Start the local polling engine\n await localService.start()\n\n writeLine(`\u2713 Local scheduler started (polling every ${Math.round(pollInterval / 1000)} seconds)`)\n writeLine('Press Ctrl+C to stop.')\n writeLine('')\n writeLine('\uD83D\uDCA1 Tip: For production, use QUEUE_STRATEGY=async with Redis.')\n writeLine('')\n\n // Keep the process alive and handle graceful shutdown\n const gracefulShutdown = async () => {\n writeLine('\\n\uD83D\uDCDB Shutting down...')\n await localService.stop()\n writeLine('\u2713 Stopped')\n process.exit(0)\n }\n\n process.on('SIGINT', gracefulShutdown)\n process.on('SIGTERM', gracefulShutdown)\n\n // Keep process alive\n await new Promise(() => {}) // Never resolves\n } catch (error: unknown) {\n writeErrorLine(`\u274C Failed to start local scheduler: ${error instanceof Error ? error.message : String(error)}`)\n process.exit(1)\n }\n }\n },\n}\n\n// Lists every persisted module-authored queue-target row with its current\n// dispatch verdict (#5213). Rows authored before the hardening by a\n// non-user-bound API key are indistinguishable from genuine registrations at\n// rest, so operators review the ALLOWED entries against their known integrations.\nconst auditQueueTargetsCommand: ModuleCli = {\n command: 'audit-queue-targets',\n async run(rest) {\n const args = parseArgs(rest)\n const { resolve } = await createRequestContainer()\n const em = resolve('em') as EntityManager\n\n const where: Record<string, unknown> = { deletedAt: null, sourceType: 'module' }\n if (args.tenant || args.tenantId) where.tenantId = args.tenant || args.tenantId\n\n const rows = await em.find(ScheduledJob, where, {\n orderBy: { name: 'ASC' },\n })\n\n const audits = auditSchedulerModuleQueueRows(rows)\n\n writeLine(`Module-authored queue-target schedules: ${audits.length}`)\n let allowedCount = 0\n for (const audit of audits) {\n const verdict = audit.dispatchAllowed ? 'ALLOWED' : 'blocked'\n if (audit.dispatchAllowed) allowedCount += 1\n writeLine(\n `[${verdict}] ${audit.scheduleId}${audit.name ? ` \u2014 ${audit.name}` : ''}` +\n ` module=${audit.sourceModule ?? '(none)'} queue=${audit.targetQueue ?? '(none)'}` +\n ` enabled=${audit.isEnabled ? 'yes' : 'no'}`,\n )\n }\n\n if (allowedCount > 0) {\n writeLine('')\n writeLine(`Review the ${allowedCount} ALLOWED row(s) above against your known module integrations.`)\n writeLine('Pre-upgrade rows created with a non-user-bound API key cannot be distinguished')\n writeLine('from genuine registrations at rest; disable anything unrecognized:')\n writeLine(' yarn mercato scheduler list --tenant <tenantId>')\n }\n },\n}\n\nexport default [listCommand, statusCommand, runCommand, startCommand, auditQueueTargetsCommand]\n"],
|
|
5
|
-
"mappings": "AACA,SAAS,8BAA8B;AAEvC,SAAS,oBAAoB;AAC7B,SAAS,yBAAyB;AAClC,SAAS,qCAAqC;
|
|
4
|
+
"sourcesContent": ["import type { ModuleCli } from '@open-mercato/shared/modules/registry'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport type { EntityManager } from '@mikro-orm/core'\nimport { ScheduledJob } from './data/entities.js'\nimport { parseBooleanToken } from '@open-mercato/shared/lib/boolean'\nimport { auditSchedulerModuleQueueRows } from './lib/safeQueueTargets'\nimport { createQueue } from '@open-mercato/queue'\nimport type { Queue } from '@open-mercato/queue'\nimport { getRedisUrlOrThrow } from '@open-mercato/shared/lib/redis/connection'\nimport type { ExecuteSchedulePayload } from './workers/execute-schedule.worker.js'\n\nconst writeLine = (text = '') => {\n process.stdout.write(`${text}\\n`)\n}\n\nconst writeErrorLine = (text: string) => {\n process.stderr.write(`${text}\\n`)\n}\n\nfunction parseArgs(rest: string[]): Record<string, string> {\n const args: Record<string, string> = {}\n for (let i = 0; i < rest.length; i += 2) {\n const key = rest[i]?.replace(/^--/, '')\n const value = rest[i + 1]\n if (key) args[key] = value ?? ''\n }\n return args\n}\n\nconst listCommand: ModuleCli = {\n command: 'list',\n async run(rest) {\n const args = parseArgs(rest)\n const { resolve } = await createRequestContainer()\n const em = resolve('em') as EntityManager\n\n const where: Record<string, unknown> = { deletedAt: null }\n\n // Filter by tenant if provided\n if (args.tenant || args.tenantId) {\n where.tenantId = args.tenant || args.tenantId\n }\n\n // Filter by scope type if provided\n if (args.scope || args.scopeType) {\n where.scopeType = args.scope || args.scopeType\n }\n\n // Filter by enabled status if provided\n if (args.enabled) {\n const parsed = parseBooleanToken(args.enabled)\n if (parsed !== null) {\n where.isEnabled = parsed\n }\n }\n\n const jobs = await em.find(ScheduledJob, where, {\n orderBy: { isEnabled: 'DESC', name: 'ASC' },\n })\n\n if (jobs.length === 0) {\n writeLine('No scheduled jobs found.')\n return\n }\n\n writeLine(`\\nFound ${jobs.length} scheduled job(s):\\n`)\n writeLine('ID'.padEnd(38) + 'Name'.padEnd(35) + 'Type'.padEnd(12) + 'Schedule'.padEnd(20) + 'Status'.padEnd(10) + 'Next Run')\n writeLine('-'.repeat(140))\n\n for (const job of jobs) {\n const id = String(job.id).padEnd(38)\n const name = (job.name || '').substring(0, 33).padEnd(35)\n const type = job.scheduleType.padEnd(12)\n const schedule = (job.scheduleValue || '').substring(0, 18).padEnd(20)\n const status = (job.isEnabled ? '\u2713 Enabled' : '\u2717 Disabled').padEnd(10)\n const nextRun = job.nextRunAt ? new Date(job.nextRunAt).toISOString() : 'N/A'\n writeLine(`${id}${name}${type}${schedule}${status}${nextRun}`)\n }\n\n writeLine('')\n },\n}\n\nconst statusCommand: ModuleCli = {\n command: 'status',\n async run() {\n const { resolve } = await createRequestContainer()\n const em = resolve('em') as EntityManager\n\n const totalCount = await em.count(ScheduledJob, { deletedAt: null })\n const enabledCount = await em.count(ScheduledJob, { isEnabled: true, deletedAt: null })\n const dueCount = await em.count(ScheduledJob, {\n isEnabled: true,\n deletedAt: null,\n nextRunAt: { $lte: new Date() },\n })\n\n const queueStrategy = process.env.QUEUE_STRATEGY || 'local'\n\n writeLine('\\n\uD83D\uDCCA Scheduler Status\\n')\n writeLine(`Strategy: ${queueStrategy === 'async' ? 'BullMQ (async)' : 'Local (polling)'}`)\n \n if (queueStrategy === 'local') {\n const pollInterval = parseInt(process.env.SCHEDULER_POLL_INTERVAL_MS || '30000', 10)\n writeLine(`Poll Interval: ${Math.round(pollInterval / 1000)}s`)\n }\n \n writeLine('')\n writeLine('Schedules:')\n writeLine(` Total: ${totalCount}`)\n writeLine(` Enabled: ${enabledCount}`)\n writeLine(` Due Now: ${dueCount}`)\n writeLine('')\n },\n}\n\nconst runCommand: ModuleCli = {\n command: 'run',\n async run(rest) {\n const scheduleId = rest[0]\n if (!scheduleId) {\n writeErrorLine('Usage: mercato scheduler run <schedule-id>')\n process.exitCode = 1\n return\n }\n\n const { resolve } = await createRequestContainer()\n const em = resolve('em') as EntityManager\n\n const job = await em.findOne(ScheduledJob, { id: scheduleId, deletedAt: null })\n if (!job) {\n writeErrorLine(`Schedule not found: ${scheduleId}`)\n process.exitCode = 1\n return\n }\n\n writeLine(`\\n\uD83D\uDE80 Manually triggering schedule: ${job.name}\\n`)\n writeLine(` ID: ${job.id}`)\n writeLine(` Type: ${job.scheduleType}`)\n writeLine(` Schedule: ${job.scheduleValue}`)\n writeLine(` Target: ${job.targetType === 'queue' ? job.targetQueue : job.targetCommand}`)\n writeLine('')\n\n // Mirrors scheduler.jobs.trigger: under the local strategy nothing consumes scheduler-execution.\n if ((process.env.QUEUE_STRATEGY || 'local') !== 'async') {\n throw new Error(\n 'Manual trigger requires QUEUE_STRATEGY=async (with the local strategy due schedules run via `mercato scheduler start`)',\n )\n }\n\n const payload: ExecuteSchedulePayload = {\n scheduleId: job.id,\n tenantId: job.tenantId,\n organizationId: job.organizationId,\n scopeType: job.scopeType,\n triggerType: 'manual',\n triggeredByUserId: null,\n }\n\n let executionQueue: Queue<ExecuteSchedulePayload> | null = null\n try {\n executionQueue = createQueue<ExecuteSchedulePayload>('scheduler-execution', 'async', {\n connection: { url: getRedisUrlOrThrow('QUEUE') },\n })\n const queueJobId = await executionQueue.enqueue(payload)\n\n writeLine(`\u2713 Job successfully triggered via scheduler-execution queue (job ${queueJobId})`)\n writeLine(` The worker will pick it up and enqueue to: ${job.targetType === 'queue' ? job.targetQueue : job.targetCommand}`)\n writeLine('\u2713 Manual trigger completed\\n')\n } catch (error: unknown) {\n throw new Error(`Failed to trigger job: ${error instanceof Error ? error.message : String(error)}`)\n } finally {\n await executionQueue?.close().catch((closeError: unknown) => {\n writeErrorLine(`Failed to close scheduler execution queue: ${closeError instanceof Error ? closeError.message : String(closeError)}`)\n })\n }\n },\n}\n\nconst startCommand: ModuleCli = {\n command: 'start',\n async run() {\n const { resolve } = await createRequestContainer()\n const queueStrategy = process.env.QUEUE_STRATEGY || 'local'\n\n writeLine(`\uD83D\uDE80 Starting scheduler (strategy: ${queueStrategy})...\\n`)\n\n if (queueStrategy === 'async') {\n // BullMQ strategy: Sync schedules with BullMQ repeatable jobs\n try {\n const bullmqService = resolve('bullmqSchedulerService') as { syncAll(): Promise<void> } | undefined\n \n if (!bullmqService) {\n writeErrorLine('\u274C BullMQSchedulerService not available.')\n writeErrorLine(' Set QUEUE_STRATEGY=async and configure REDIS_URL.')\n process.exit(1)\n }\n\n // Sync all enabled schedules with BullMQ\n await bullmqService.syncAll()\n\n writeLine('\u2713 Scheduler sync completed')\n writeLine('')\n writeLine('BullMQ is managing all schedules.')\n writeLine('Start workers to process jobs:')\n writeLine(' yarn mercato worker:start')\n writeLine('')\n } catch (error: unknown) {\n writeErrorLine(`\u274C Failed to sync schedules: ${error instanceof Error ? error.message : String(error)}`)\n process.exit(1)\n }\n } else {\n // Local strategy: Start polling engine\n try {\n const localService = resolve('localSchedulerService') as { start(): Promise<void>; stop(): Promise<void> } | undefined\n \n if (!localService) {\n writeErrorLine('\u274C LocalSchedulerService not available.')\n writeErrorLine(' This should not happen in local mode.')\n process.exit(1)\n }\n\n const pollInterval = parseInt(process.env.SCHEDULER_POLL_INTERVAL_MS || '30000', 10)\n\n // Start the local polling engine\n await localService.start()\n\n writeLine(`\u2713 Local scheduler started (polling every ${Math.round(pollInterval / 1000)} seconds)`)\n writeLine('Press Ctrl+C to stop.')\n writeLine('')\n writeLine('\uD83D\uDCA1 Tip: For production, use QUEUE_STRATEGY=async with Redis.')\n writeLine('')\n\n // Keep the process alive and handle graceful shutdown\n const gracefulShutdown = async () => {\n writeLine('\\n\uD83D\uDCDB Shutting down...')\n await localService.stop()\n writeLine('\u2713 Stopped')\n process.exit(0)\n }\n\n process.on('SIGINT', gracefulShutdown)\n process.on('SIGTERM', gracefulShutdown)\n\n // Keep process alive\n await new Promise(() => {}) // Never resolves\n } catch (error: unknown) {\n writeErrorLine(`\u274C Failed to start local scheduler: ${error instanceof Error ? error.message : String(error)}`)\n process.exit(1)\n }\n }\n },\n}\n\n// Lists every persisted module-authored queue-target row with its current\n// dispatch verdict (#5213). Rows authored before the hardening by a\n// non-user-bound API key are indistinguishable from genuine registrations at\n// rest, so operators review the ALLOWED entries against their known integrations.\nconst auditQueueTargetsCommand: ModuleCli = {\n command: 'audit-queue-targets',\n async run(rest) {\n const args = parseArgs(rest)\n const { resolve } = await createRequestContainer()\n const em = resolve('em') as EntityManager\n\n const where: Record<string, unknown> = { deletedAt: null, sourceType: 'module' }\n if (args.tenant || args.tenantId) where.tenantId = args.tenant || args.tenantId\n\n const rows = await em.find(ScheduledJob, where, {\n orderBy: { name: 'ASC' },\n })\n\n const audits = auditSchedulerModuleQueueRows(rows)\n\n writeLine(`Module-authored queue-target schedules: ${audits.length}`)\n let allowedCount = 0\n for (const audit of audits) {\n const verdict = audit.dispatchAllowed ? 'ALLOWED' : 'blocked'\n if (audit.dispatchAllowed) allowedCount += 1\n writeLine(\n `[${verdict}] ${audit.scheduleId}${audit.name ? ` \u2014 ${audit.name}` : ''}` +\n ` module=${audit.sourceModule ?? '(none)'} queue=${audit.targetQueue ?? '(none)'}` +\n ` enabled=${audit.isEnabled ? 'yes' : 'no'}`,\n )\n }\n\n if (allowedCount > 0) {\n writeLine('')\n writeLine(`Review the ${allowedCount} ALLOWED row(s) above against your known module integrations.`)\n writeLine('Pre-upgrade rows created with a non-user-bound API key cannot be distinguished')\n writeLine('from genuine registrations at rest; disable anything unrecognized:')\n writeLine(' yarn mercato scheduler list --tenant <tenantId>')\n }\n },\n}\n\nexport default [listCommand, statusCommand, runCommand, startCommand, auditQueueTargetsCommand]\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -121,7 +121,7 @@ const scheduleCreateSchema = scheduleBaseSchema.refine(
|
|
|
121
121
|
}
|
|
122
122
|
);
|
|
123
123
|
const scheduleUpdateSchema = z.object({
|
|
124
|
-
id: z.
|
|
124
|
+
id: z.guid(),
|
|
125
125
|
name: z.string().min(1).max(200).optional(),
|
|
126
126
|
description: z.string().max(500).optional().nullable(),
|
|
127
127
|
scheduleType: z.enum(["cron", "interval"]).optional(),
|
|
@@ -198,12 +198,12 @@ const scheduleUpdateSchema = z.object({
|
|
|
198
198
|
}
|
|
199
199
|
);
|
|
200
200
|
const scheduleDeleteSchema = z.object({
|
|
201
|
-
id: z.
|
|
201
|
+
id: z.guid()
|
|
202
202
|
});
|
|
203
203
|
const scheduleListQuerySchema = z.object({
|
|
204
204
|
page: z.coerce.number().int().min(1).default(1),
|
|
205
205
|
pageSize: z.coerce.number().int().min(1).max(100).default(20),
|
|
206
|
-
id: z.
|
|
206
|
+
id: z.guid().optional(),
|
|
207
207
|
search: z.string().optional(),
|
|
208
208
|
scopeType: z.enum(["system", "organization", "tenant"]).optional(),
|
|
209
209
|
isEnabled: z.string().optional().transform((val) => {
|
|
@@ -216,12 +216,12 @@ const scheduleListQuerySchema = z.object({
|
|
|
216
216
|
order: z.enum(["asc", "desc"]).optional()
|
|
217
217
|
});
|
|
218
218
|
const scheduleTriggerSchema = z.object({
|
|
219
|
-
id: z.
|
|
219
|
+
id: z.guid()
|
|
220
220
|
});
|
|
221
221
|
const scheduleRunsQuerySchema = z.object({
|
|
222
222
|
page: z.coerce.number().int().min(1).default(1),
|
|
223
223
|
pageSize: z.coerce.number().int().min(1).max(100).default(20),
|
|
224
|
-
scheduledJobId: z.
|
|
224
|
+
scheduledJobId: z.guid().optional(),
|
|
225
225
|
status: z.enum(["running", "completed", "failed", "skipped"]).optional(),
|
|
226
226
|
triggerType: z.enum(["scheduled", "manual"]).optional(),
|
|
227
227
|
fromDate: z.string().datetime().optional(),
|
|
@@ -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'\nimport { isSchedulerSafeQueue, validateSchedulerTargetPayload } from '../lib/safeQueueTargets'\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 * Validate that a queue was declared scheduler-safe by its owning worker.\n * Internal and system-only workers (webhook processors, indexers, \u2026) stay\n * undiscoverable as schedule targets \u2014 see issue #5213.\n */\nfunction validateSchedulerSafeQueue(queue: string | null | undefined): boolean {\n return isSchedulerSafeQueue(queue)\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})\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 .refine(\n (data) => {\n if (data.targetType === 'queue' && data.targetQueue) {\n return validateSchedulerSafeQueue(data.targetQueue)\n }\n return true\n },\n {\n message: 'Target queue is not an approved scheduler target. Only workers that opted into scheduling can be selected.',\n path: ['targetQueue'],\n }\n )\n .refine(\n (data) => {\n if (data.targetType === 'queue' && data.targetQueue) {\n return validateSchedulerTargetPayload(data.targetQueue, data.targetPayload) === null\n }\n return true\n },\n {\n message: 'Invalid target payload for the selected scheduler queue.',\n path: ['targetPayload'],\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 // Queue-target safety and payload-shape rules for updates are enforced in the\n // scheduler.jobs.update command against the stored row, so unchanged targets\n // (always resent by the edit form) and legacy remediation stays possible (#5213).\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/registry'\nimport { parseBooleanToken } from '@open-mercato/shared/lib/boolean'\nimport { isSchedulerSafeCommandId } from '../lib/scheduler-safe-commands'\nimport { isSchedulerSafeQueue, validateSchedulerTargetPayload } from '../lib/safeQueueTargets'\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 * Validate that a queue was declared scheduler-safe by its owning worker.\n * Internal and system-only workers (webhook processors, indexers, \u2026) stay\n * undiscoverable as schedule targets \u2014 see issue #5213.\n */\nfunction validateSchedulerSafeQueue(queue: string | null | undefined): boolean {\n return isSchedulerSafeQueue(queue)\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})\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 .refine(\n (data) => {\n if (data.targetType === 'queue' && data.targetQueue) {\n return validateSchedulerSafeQueue(data.targetQueue)\n }\n return true\n },\n {\n message: 'Target queue is not an approved scheduler target. Only workers that opted into scheduling can be selected.',\n path: ['targetQueue'],\n }\n )\n .refine(\n (data) => {\n if (data.targetType === 'queue' && data.targetQueue) {\n return validateSchedulerTargetPayload(data.targetQueue, data.targetPayload) === null\n }\n return true\n },\n {\n message: 'Invalid target payload for the selected scheduler queue.',\n path: ['targetPayload'],\n }\n )\n\n/**\n * Update schedule schema (all fields optional except id)\n */\nexport const scheduleUpdateSchema = z.object({\n id: z.guid(),\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 // Queue-target safety and payload-shape rules for updates are enforced in the\n // scheduler.jobs.update command against the stored row, so unchanged targets\n // (always resent by the edit form) and legacy remediation stays possible (#5213).\n\n/**\n * Delete schedule schema\n */\nexport const scheduleDeleteSchema = z.object({\n id: z.guid(),\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.guid().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.guid(),\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.guid().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
|
}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import { getRedisUrlOrThrow, parseRedisUrl } from "@open-mercato/shared/lib/redis/connection";
|
|
2
|
+
import { createLogger } from "@open-mercato/shared/lib/logger";
|
|
3
|
+
const logger = createLogger("scheduler").child({ component: "next-run-sync" });
|
|
4
|
+
const BULLMQ_NEXT_RUN_READ_TIMEOUT_MS = 2e3;
|
|
5
|
+
function toBullmqNextRun(state) {
|
|
6
|
+
if (!state || typeof state.next !== "number" || !Number.isFinite(state.next)) return null;
|
|
7
|
+
return {
|
|
8
|
+
nextRunAt: new Date(state.next),
|
|
9
|
+
...typeof state.pattern === "string" ? { pattern: state.pattern } : {},
|
|
10
|
+
...typeof state.every === "number" ? { every: state.every } : {},
|
|
11
|
+
...typeof state.tz === "string" ? { timezone: state.tz } : {}
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
async function readAndClose(queue, scheduleId) {
|
|
15
|
+
try {
|
|
16
|
+
if (typeof queue.getJobScheduler !== "function") return null;
|
|
17
|
+
return toBullmqNextRun(await queue.getJobScheduler(`schedule-${scheduleId}`));
|
|
18
|
+
} finally {
|
|
19
|
+
await queue.close().catch((error) => {
|
|
20
|
+
logger.debug("Failed to close the BullMQ queue after reading the job scheduler", { scheduleId, err: error });
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
async function readBullmqNextRun(scheduleId, timeoutMs = BULLMQ_NEXT_RUN_READ_TIMEOUT_MS) {
|
|
25
|
+
const { Queue } = await import("bullmq");
|
|
26
|
+
const queue = new Queue("scheduler-execution", {
|
|
27
|
+
connection: parseRedisUrl(getRedisUrlOrThrow("QUEUE"))
|
|
28
|
+
});
|
|
29
|
+
let lastConnectionError;
|
|
30
|
+
queue.on("error", (error) => {
|
|
31
|
+
lastConnectionError = error;
|
|
32
|
+
});
|
|
33
|
+
let timer;
|
|
34
|
+
let timedOut = false;
|
|
35
|
+
const deadline = new Promise((_resolve, reject) => {
|
|
36
|
+
timer = setTimeout(() => {
|
|
37
|
+
timedOut = true;
|
|
38
|
+
reject(new Error(
|
|
39
|
+
`[internal] Timed out after ${timeoutMs}ms reading the BullMQ job scheduler`,
|
|
40
|
+
lastConnectionError ? { cause: lastConnectionError } : void 0
|
|
41
|
+
));
|
|
42
|
+
}, timeoutMs);
|
|
43
|
+
});
|
|
44
|
+
const read = readAndClose(queue, scheduleId);
|
|
45
|
+
try {
|
|
46
|
+
return await Promise.race([read, deadline]);
|
|
47
|
+
} catch (error) {
|
|
48
|
+
if (timedOut) {
|
|
49
|
+
queue.close().catch(() => void 0);
|
|
50
|
+
queue.disconnect().catch(() => void 0);
|
|
51
|
+
}
|
|
52
|
+
throw error;
|
|
53
|
+
} finally {
|
|
54
|
+
if (timer) clearTimeout(timer);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
export {
|
|
58
|
+
BULLMQ_NEXT_RUN_READ_TIMEOUT_MS,
|
|
59
|
+
readBullmqNextRun
|
|
60
|
+
};
|
|
61
|
+
//# sourceMappingURL=bullmqNextRun.js.map
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../../src/modules/scheduler/lib/bullmqNextRun.ts"],
|
|
4
|
+
"sourcesContent": ["import { getRedisUrlOrThrow, parseRedisUrl } from '@open-mercato/shared/lib/redis/connection'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('scheduler').child({ component: 'next-run-sync' })\n\nexport const BULLMQ_NEXT_RUN_READ_TIMEOUT_MS = 2000\n\nexport type BullmqNextRun = {\n nextRunAt: Date\n pattern?: string\n every?: number\n timezone?: string\n}\n\ninterface BullJobSchedulerState {\n next?: number | null\n pattern?: string | null\n every?: number | null\n tz?: string | null\n}\n\ninterface BullNextRunQueue {\n getJobScheduler?(id: string): Promise<BullJobSchedulerState | undefined>\n on(event: 'error', listener: (error: Error) => void): unknown\n close(): Promise<void>\n disconnect(): Promise<void>\n}\n\nfunction toBullmqNextRun(state: BullJobSchedulerState | undefined): BullmqNextRun | null {\n if (!state || typeof state.next !== 'number' || !Number.isFinite(state.next)) return null\n return {\n nextRunAt: new Date(state.next),\n ...(typeof state.pattern === 'string' ? { pattern: state.pattern } : {}),\n ...(typeof state.every === 'number' ? { every: state.every } : {}),\n ...(typeof state.tz === 'string' ? { timezone: state.tz } : {}),\n }\n}\n\nasync function readAndClose(queue: BullNextRunQueue, scheduleId: string): Promise<BullmqNextRun | null> {\n try {\n if (typeof queue.getJobScheduler !== 'function') return null\n return toBullmqNextRun(await queue.getJobScheduler(`schedule-${scheduleId}`))\n } finally {\n await queue.close().catch((error: unknown) => {\n logger.debug('Failed to close the BullMQ queue after reading the job scheduler', { scheduleId, err: error })\n })\n }\n}\n\n/**\n * Reads the instant BullMQ will fire a schedule next, straight from its Job Scheduler.\n *\n * BullMQ moves a scheduler to its following slot before it hands the current\n * slot's job to the processor, so from inside a running execution this is the\n * upcoming fire, not the one being executed.\n *\n * The queue handle is opened and closed per call on purpose. Workers build a\n * fresh DI container for every job and never dispose it, so the DI-registered\n * `BullMQSchedulerService` \u2014 which caches its queue on the instance \u2014 would\n * leave one Redis connection behind per execution.\n *\n * Open, read and close share one deadline: during a Redis outage commands queue\n * up instead of failing, and a caller awaiting this from a `finally` must not\n * hold its worker slot open. Past the deadline the handle is torn down both\n * ways, because each covers a state the other waits on: `close()` drops a\n * connection that never became ready, `disconnect()` drops one that is ready\n * but not answering. The timeout error carries the last connection error\n * BullMQ emitted as its `cause`; the listener also keeps BullMQ from printing\n * those errors to the console itself. A close that fails after a completed read\n * is only logged, so it can neither discard the value nor replace the read's\n * own error. Returns `null` when the installed BullMQ has no\n * `getJobScheduler`, when the scheduler does not exist, or when it has no next\n * slot.\n */\nexport async function readBullmqNextRun(\n scheduleId: string,\n timeoutMs: number = BULLMQ_NEXT_RUN_READ_TIMEOUT_MS,\n): Promise<BullmqNextRun | null> {\n const { Queue } = await import('bullmq')\n const queue = new Queue('scheduler-execution', {\n connection: parseRedisUrl(getRedisUrlOrThrow('QUEUE')),\n }) as unknown as BullNextRunQueue\n let lastConnectionError: Error | undefined\n queue.on('error', (error) => {\n lastConnectionError = error\n })\n\n let timer: NodeJS.Timeout | undefined\n let timedOut = false\n const deadline = new Promise<never>((_resolve, reject) => {\n timer = setTimeout(() => {\n timedOut = true\n reject(new Error(\n `[internal] Timed out after ${timeoutMs}ms reading the BullMQ job scheduler`,\n lastConnectionError ? { cause: lastConnectionError } : undefined,\n ))\n }, timeoutMs)\n })\n const read = readAndClose(queue, scheduleId)\n\n try {\n return await Promise.race([read, deadline])\n } catch (error) {\n if (timedOut) {\n queue.close().catch(() => undefined)\n queue.disconnect().catch(() => undefined)\n }\n throw error\n } finally {\n if (timer) clearTimeout(timer)\n }\n}\n"],
|
|
5
|
+
"mappings": "AAAA,SAAS,oBAAoB,qBAAqB;AAClD,SAAS,oBAAoB;AAE7B,MAAM,SAAS,aAAa,WAAW,EAAE,MAAM,EAAE,WAAW,gBAAgB,CAAC;AAEtE,MAAM,kCAAkC;AAuB/C,SAAS,gBAAgB,OAAgE;AACvF,MAAI,CAAC,SAAS,OAAO,MAAM,SAAS,YAAY,CAAC,OAAO,SAAS,MAAM,IAAI,EAAG,QAAO;AACrF,SAAO;AAAA,IACL,WAAW,IAAI,KAAK,MAAM,IAAI;AAAA,IAC9B,GAAI,OAAO,MAAM,YAAY,WAAW,EAAE,SAAS,MAAM,QAAQ,IAAI,CAAC;AAAA,IACtE,GAAI,OAAO,MAAM,UAAU,WAAW,EAAE,OAAO,MAAM,MAAM,IAAI,CAAC;AAAA,IAChE,GAAI,OAAO,MAAM,OAAO,WAAW,EAAE,UAAU,MAAM,GAAG,IAAI,CAAC;AAAA,EAC/D;AACF;AAEA,eAAe,aAAa,OAAyB,YAAmD;AACtG,MAAI;AACF,QAAI,OAAO,MAAM,oBAAoB,WAAY,QAAO;AACxD,WAAO,gBAAgB,MAAM,MAAM,gBAAgB,YAAY,UAAU,EAAE,CAAC;AAAA,EAC9E,UAAE;AACA,UAAM,MAAM,MAAM,EAAE,MAAM,CAAC,UAAmB;AAC5C,aAAO,MAAM,oEAAoE,EAAE,YAAY,KAAK,MAAM,CAAC;AAAA,IAC7G,CAAC;AAAA,EACH;AACF;AA2BA,eAAsB,kBACpB,YACA,YAAoB,iCACW;AAC/B,QAAM,EAAE,MAAM,IAAI,MAAM,OAAO,QAAQ;AACvC,QAAM,QAAQ,IAAI,MAAM,uBAAuB;AAAA,IAC7C,YAAY,cAAc,mBAAmB,OAAO,CAAC;AAAA,EACvD,CAAC;AACD,MAAI;AACJ,QAAM,GAAG,SAAS,CAAC,UAAU;AAC3B,0BAAsB;AAAA,EACxB,CAAC;AAED,MAAI;AACJ,MAAI,WAAW;AACf,QAAM,WAAW,IAAI,QAAe,CAAC,UAAU,WAAW;AACxD,YAAQ,WAAW,MAAM;AACvB,iBAAW;AACX,aAAO,IAAI;AAAA,QACT,8BAA8B,SAAS;AAAA,QACvC,sBAAsB,EAAE,OAAO,oBAAoB,IAAI;AAAA,MACzD,CAAC;AAAA,IACH,GAAG,SAAS;AAAA,EACd,CAAC;AACD,QAAM,OAAO,aAAa,OAAO,UAAU;AAE3C,MAAI;AACF,WAAO,MAAM,QAAQ,KAAK,CAAC,MAAM,QAAQ,CAAC;AAAA,EAC5C,SAAS,OAAO;AACd,QAAI,UAAU;AACZ,YAAM,MAAM,EAAE,MAAM,MAAM,MAAS;AACnC,YAAM,WAAW,EAAE,MAAM,MAAM,MAAS;AAAA,IAC1C;AACA,UAAM;AAAA,EACR,UAAE;AACA,QAAI,MAAO,cAAa,KAAK;AAAA,EAC/B;AACF;",
|
|
6
|
+
"names": []
|
|
7
|
+
}
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
import { createLogger } from "@open-mercato/shared/lib/logger";
|
|
2
|
+
import { getTelemetryRuntime } from "@open-mercato/shared/lib/telemetry/runtime";
|
|
3
|
+
import { readBullmqNextRun } from "./bullmqNextRun.js";
|
|
4
|
+
import { parseInterval, resolveScheduleIntervalMs } from "./intervalParser.js";
|
|
5
|
+
const logger = createLogger("scheduler").child({ component: "next-run-sync" });
|
|
6
|
+
const UPDATE_NEXT_RUN_AT_SQL = `update scheduled_jobs
|
|
7
|
+
set next_run_at = ?
|
|
8
|
+
where id = ?
|
|
9
|
+
and tenant_id is not distinct from ?
|
|
10
|
+
and organization_id is not distinct from ?
|
|
11
|
+
and deleted_at is null
|
|
12
|
+
and is_enabled = true
|
|
13
|
+
and schedule_type = ?
|
|
14
|
+
and schedule_value = ?
|
|
15
|
+
and timezone = ?
|
|
16
|
+
and ? > now()
|
|
17
|
+
and next_run_at is distinct from ?`;
|
|
18
|
+
function intervalCandidates(scheduleValue) {
|
|
19
|
+
try {
|
|
20
|
+
return [resolveScheduleIntervalMs(scheduleValue), parseInterval(scheduleValue)];
|
|
21
|
+
} catch {
|
|
22
|
+
return [];
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
function bullmqNextRunMatchesTiming(next, timing) {
|
|
26
|
+
if (timing.scheduleType === "cron") {
|
|
27
|
+
return next.pattern === timing.scheduleValue && (next.timezone ?? "UTC") === (timing.timezone || "UTC");
|
|
28
|
+
}
|
|
29
|
+
return typeof next.every === "number" && intervalCandidates(timing.scheduleValue).includes(next.every);
|
|
30
|
+
}
|
|
31
|
+
async function syncScheduleNextRunAt(resolveEm, timing) {
|
|
32
|
+
if (process.env.QUEUE_STRATEGY !== "async") return;
|
|
33
|
+
try {
|
|
34
|
+
const next = await readBullmqNextRun(timing.scheduleId);
|
|
35
|
+
if (!next) return;
|
|
36
|
+
if (!bullmqNextRunMatchesTiming(next, timing)) {
|
|
37
|
+
logger.debug("Skipping nextRunAt sync: BullMQ scheduler does not match the loaded schedule timing", {
|
|
38
|
+
scheduleId: timing.scheduleId,
|
|
39
|
+
scheduleType: timing.scheduleType,
|
|
40
|
+
scheduleValue: timing.scheduleValue,
|
|
41
|
+
timezone: timing.timezone,
|
|
42
|
+
bullmqPattern: next.pattern,
|
|
43
|
+
bullmqEvery: next.every,
|
|
44
|
+
bullmqTimezone: next.timezone
|
|
45
|
+
});
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
await resolveEm().getConnection().execute(
|
|
49
|
+
UPDATE_NEXT_RUN_AT_SQL,
|
|
50
|
+
[
|
|
51
|
+
next.nextRunAt,
|
|
52
|
+
timing.scheduleId,
|
|
53
|
+
timing.tenantId,
|
|
54
|
+
timing.organizationId,
|
|
55
|
+
timing.scheduleType,
|
|
56
|
+
timing.scheduleValue,
|
|
57
|
+
timing.timezone,
|
|
58
|
+
next.nextRunAt,
|
|
59
|
+
next.nextRunAt
|
|
60
|
+
],
|
|
61
|
+
"run"
|
|
62
|
+
);
|
|
63
|
+
} catch (error) {
|
|
64
|
+
logger.warn("Failed to sync nextRunAt from BullMQ", { scheduleId: timing.scheduleId, err: error });
|
|
65
|
+
try {
|
|
66
|
+
getTelemetryRuntime()?.reportError(error, {
|
|
67
|
+
module: "scheduler",
|
|
68
|
+
code: "scheduler.next_run_sync_failed",
|
|
69
|
+
attributes: { scheduleId: timing.scheduleId }
|
|
70
|
+
});
|
|
71
|
+
} catch (telemetryError) {
|
|
72
|
+
logger.warn("Failed to report a nextRunAt sync error to telemetry", { err: telemetryError });
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
export {
|
|
77
|
+
bullmqNextRunMatchesTiming,
|
|
78
|
+
syncScheduleNextRunAt
|
|
79
|
+
};
|
|
80
|
+
//# sourceMappingURL=nextRunSync.js.map
|