@open-mercato/scheduler 0.6.7 → 0.6.8-develop.6875.1.871a4afc94

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (69) hide show
  1. package/.turbo/turbo-build.log +1 -1
  2. package/dist/modules/scheduler/__integration__/TC-SCHED-007.spec.js +4 -1
  3. package/dist/modules/scheduler/__integration__/TC-SCHED-007.spec.js.map +2 -2
  4. package/dist/modules/scheduler/api/jobs/[id]/executions/route.js +4 -2
  5. package/dist/modules/scheduler/api/jobs/[id]/executions/route.js.map +2 -2
  6. package/dist/modules/scheduler/api/queue-jobs/[jobId]/route.js +4 -2
  7. package/dist/modules/scheduler/api/queue-jobs/[jobId]/route.js.map +2 -2
  8. package/dist/modules/scheduler/api/targets/route.js +5 -4
  9. package/dist/modules/scheduler/api/targets/route.js.map +2 -2
  10. package/dist/modules/scheduler/commands/jobs.js +33 -14
  11. package/dist/modules/scheduler/commands/jobs.js.map +2 -2
  12. package/dist/modules/scheduler/components/ExecutionDetailsDialog.js +1 -1
  13. package/dist/modules/scheduler/components/ExecutionDetailsDialog.js.map +2 -2
  14. package/dist/modules/scheduler/components/JobLogsModal.js +1 -1
  15. package/dist/modules/scheduler/components/JobLogsModal.js.map +2 -2
  16. package/dist/modules/scheduler/data/validators.js +27 -1
  17. package/dist/modules/scheduler/data/validators.js.map +2 -2
  18. package/dist/modules/scheduler/i18n/de.json +2 -0
  19. package/dist/modules/scheduler/i18n/en.json +2 -0
  20. package/dist/modules/scheduler/i18n/es.json +2 -0
  21. package/dist/modules/scheduler/i18n/ko.json +157 -0
  22. package/dist/modules/scheduler/i18n/pl.json +2 -0
  23. package/dist/modules/scheduler/lib/activeScheduleLimits.js +44 -0
  24. package/dist/modules/scheduler/lib/activeScheduleLimits.js.map +7 -0
  25. package/dist/modules/scheduler/lib/intervalParser.js +8 -3
  26. package/dist/modules/scheduler/lib/intervalParser.js.map +2 -2
  27. package/dist/modules/scheduler/lib/nextRunCalculator.js +8 -1
  28. package/dist/modules/scheduler/lib/nextRunCalculator.js.map +2 -2
  29. package/dist/modules/scheduler/lib/scheduler-safe-commands.js +73 -0
  30. package/dist/modules/scheduler/lib/scheduler-safe-commands.js.map +7 -0
  31. package/dist/modules/scheduler/services/bullmqSchedulerService.js +92 -43
  32. package/dist/modules/scheduler/services/bullmqSchedulerService.js.map +2 -2
  33. package/dist/modules/scheduler/services/localSchedulerService.js +9 -0
  34. package/dist/modules/scheduler/services/localSchedulerService.js.map +2 -2
  35. package/dist/modules/scheduler/services/schedulerService.js +23 -11
  36. package/dist/modules/scheduler/services/schedulerService.js.map +2 -2
  37. package/dist/modules/scheduler/workers/execute-schedule.worker.js +9 -0
  38. package/dist/modules/scheduler/workers/execute-schedule.worker.js.map +2 -2
  39. package/package.json +10 -9
  40. package/src/modules/scheduler/__integration__/TC-SCHED-007.spec.ts +6 -4
  41. package/src/modules/scheduler/api/jobs/[id]/executions/route.ts +4 -2
  42. package/src/modules/scheduler/api/queue-jobs/[jobId]/route.ts +4 -2
  43. package/src/modules/scheduler/api/targets/__tests__/route.test.ts +76 -0
  44. package/src/modules/scheduler/api/targets/route.ts +7 -7
  45. package/src/modules/scheduler/commands/__tests__/jobs.active-limit.test.ts +184 -0
  46. package/src/modules/scheduler/commands/jobs.ts +40 -15
  47. package/src/modules/scheduler/components/ExecutionDetailsDialog.tsx +1 -1
  48. package/src/modules/scheduler/components/JobLogsModal.tsx +1 -1
  49. package/src/modules/scheduler/data/__tests__/validators.test.ts +69 -9
  50. package/src/modules/scheduler/data/validators.ts +30 -1
  51. package/src/modules/scheduler/i18n/de.json +2 -0
  52. package/src/modules/scheduler/i18n/en.json +2 -0
  53. package/src/modules/scheduler/i18n/es.json +2 -0
  54. package/src/modules/scheduler/i18n/ko.json +157 -0
  55. package/src/modules/scheduler/i18n/pl.json +2 -0
  56. package/src/modules/scheduler/lib/__tests__/intervalParser.test.ts +27 -9
  57. package/src/modules/scheduler/lib/__tests__/nextRunCalculator.test.ts +18 -7
  58. package/src/modules/scheduler/lib/activeScheduleLimits.ts +48 -0
  59. package/src/modules/scheduler/lib/intervalParser.ts +8 -3
  60. package/src/modules/scheduler/lib/nextRunCalculator.ts +14 -1
  61. package/src/modules/scheduler/lib/scheduler-safe-commands.ts +98 -0
  62. package/src/modules/scheduler/services/__tests__/bullmqSchedulerService.test.ts +246 -149
  63. package/src/modules/scheduler/services/__tests__/localSchedulerService.test.ts +97 -1
  64. package/src/modules/scheduler/services/__tests__/schedulerService.test.ts +101 -0
  65. package/src/modules/scheduler/services/bullmqSchedulerService.ts +135 -49
  66. package/src/modules/scheduler/services/localSchedulerService.ts +11 -0
  67. package/src/modules/scheduler/services/schedulerService.ts +27 -12
  68. package/src/modules/scheduler/workers/__tests__/execute-schedule.worker.test.ts +12 -0
  69. package/src/modules/scheduler/workers/execute-schedule.worker.ts +15 -0
@@ -1,6 +1,7 @@
1
1
  import type { EntityManager } from '@mikro-orm/core'
2
2
  import { ScheduledJob } from '../data/entities.js'
3
- import { calculateNextRun } from '../lib/nextRunCalculator.js'
3
+ import { calculateNextRunForWrite } from '../lib/nextRunCalculator.js'
4
+ import { enforceTenantActiveScheduleLimit } from '../lib/activeScheduleLimits.js'
4
5
  import type { BullMQSchedulerService } from './bullmqSchedulerService.js'
5
6
  import { createLogger } from '@open-mercato/shared/lib/logger'
6
7
 
@@ -45,7 +46,7 @@ export class SchedulerService {
45
46
  this.validateTarget(registration)
46
47
 
47
48
  // Calculate next run time
48
- const nextRunAt = calculateNextRun(
49
+ const nextRunAt = calculateNextRunForWrite(
49
50
  registration.scheduleType,
50
51
  registration.scheduleValue,
51
52
  registration.timezone || 'UTC'
@@ -57,6 +58,12 @@ export class SchedulerService {
57
58
 
58
59
  // Check if schedule already exists
59
60
  let schedule = await em.findOne(ScheduledJob, { id: registration.id })
61
+ const nextTenantId = registration.tenantId || null
62
+ const nextIsEnabled = registration.isEnabled !== undefined ? registration.isEnabled : (schedule?.isEnabled ?? true)
63
+ const tenantChanged = schedule ? (schedule.tenantId || null) !== nextTenantId : false
64
+ if (nextIsEnabled && (schedule?.isEnabled !== true || tenantChanged)) {
65
+ await enforceTenantActiveScheduleLimit(em, nextTenantId)
66
+ }
60
67
 
61
68
  if (schedule) {
62
69
  // Update existing
@@ -165,6 +172,22 @@ export class SchedulerService {
165
172
  if (!schedule) {
166
173
  throw new Error(`Schedule not found: ${scheduleId}`)
167
174
  }
175
+
176
+ if (changes.isEnabled === true && schedule.isEnabled !== true) {
177
+ await enforceTenantActiveScheduleLimit(em, schedule.tenantId)
178
+ }
179
+
180
+ const scheduleChanged = changes.scheduleType !== undefined || changes.scheduleValue !== undefined || changes.timezone !== undefined
181
+ const nextRunAt = scheduleChanged
182
+ ? calculateNextRunForWrite(
183
+ changes.scheduleType ?? schedule.scheduleType,
184
+ changes.scheduleValue ?? schedule.scheduleValue,
185
+ changes.timezone ?? schedule.timezone,
186
+ )
187
+ : null
188
+ if (scheduleChanged && !nextRunAt) {
189
+ throw new Error(`Failed to calculate next run time for schedule: ${scheduleId}`)
190
+ }
168
191
 
169
192
  // Apply changes
170
193
  if (changes.name !== undefined) schedule.name = changes.name
@@ -197,16 +220,8 @@ export class SchedulerService {
197
220
  if (changes.targetCommand !== undefined) schedule.targetCommand = changes.targetCommand || null
198
221
  }
199
222
 
200
- // Recalculate next run if schedule changed
201
- if (changes.scheduleType !== undefined || changes.scheduleValue !== undefined || changes.timezone !== undefined) {
202
- const nextRunAt = calculateNextRun(
203
- schedule.scheduleType,
204
- schedule.scheduleValue,
205
- schedule.timezone
206
- )
207
- if (nextRunAt) {
208
- schedule.nextRunAt = nextRunAt
209
- }
223
+ if (nextRunAt) {
224
+ schedule.nextRunAt = nextRunAt
210
225
  }
211
226
 
212
227
  schedule.updatedAt = new Date()
@@ -2,6 +2,7 @@ import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
2
2
  import { ensureTenantScope } from '@open-mercato/shared/lib/commands/scope'
3
3
  import { createQueue } from '@open-mercato/queue'
4
4
  import { ScheduledJob } from '../../data/entities'
5
+ import { registerSchedulerSafeCommands } from '../../lib/scheduler-safe-commands'
5
6
  import executeScheduleWorker from '../execute-schedule.worker'
6
7
 
7
8
  const mockCommandExecute = jest.fn()
@@ -41,6 +42,7 @@ function buildCommandSchedule(overrides: Partial<ScheduledJob> = {}): ScheduledJ
41
42
  schedule.scheduleValue = '* * * * *'
42
43
  schedule.timezone = 'UTC'
43
44
  schedule.sourceType = 'user'
45
+ schedule.createdByUserId = 'user-a'
44
46
  schedule.createdAt = new Date('2026-01-01T00:00:00.000Z')
45
47
  schedule.updatedAt = new Date('2026-01-01T00:00:00.000Z')
46
48
  Object.assign(schedule, overrides)
@@ -54,6 +56,7 @@ function buildWorkerContext(schedule: ScheduledJob) {
54
56
  }
55
57
  const rbacService = {
56
58
  tenantHasFeature: jest.fn(async () => true),
59
+ userHasAllFeatures: jest.fn(async () => true),
57
60
  }
58
61
  return {
59
62
  context: {
@@ -71,6 +74,15 @@ function buildWorkerContext(schedule: ScheduledJob) {
71
74
  }
72
75
 
73
76
  describe('executeScheduleWorker command scope', () => {
77
+ beforeAll(() => {
78
+ registerSchedulerSafeCommands([
79
+ {
80
+ commandId: 'scheduler.test.assert-tenant-scope',
81
+ requiredFeatures: ['scheduler.jobs.manage'],
82
+ },
83
+ ])
84
+ })
85
+
74
86
  afterEach(() => {
75
87
  mockCommandExecute.mockReset()
76
88
  })
@@ -6,6 +6,7 @@ import { ScheduledJob } from '../data/entities.js'
6
6
  import { CommandBus } from '@open-mercato/shared/lib/commands'
7
7
  import type { AppContainer } from '@open-mercato/shared/lib/di/container'
8
8
  import { emitSchedulerEvent } from '../events.js'
9
+ import { assertSchedulerSafeCommandAuthorized } from '../lib/scheduler-safe-commands.js'
9
10
  import { buildScheduledCommandContext } from '../lib/commandContext.js'
10
11
  import { buildQueueTargetPayload, buildSchedulerIdempotencyKey } from '../lib/queueTargetPayload.js'
11
12
  import { createLogger } from '@open-mercato/shared/lib/logger'
@@ -34,6 +35,11 @@ type RbacServiceLike = {
34
35
  feature: string,
35
36
  opts?: { organizationId?: string | null },
36
37
  ): Promise<boolean>
38
+ userHasAllFeatures(
39
+ userId: string,
40
+ required: readonly string[],
41
+ scope: { tenantId: string | null; organizationId: string | null },
42
+ ): Promise<boolean>
37
43
  }
38
44
 
39
45
  /**
@@ -205,6 +211,14 @@ export default async function executeScheduleWorker(
205
211
 
206
212
  } else if (schedule.targetType === 'command' && schedule.targetCommand) {
207
213
  const commandBus = new CommandBus()
214
+ const actorUserId = typeof schedule.createdByUserId === 'string' ? schedule.createdByUserId.trim() : ''
215
+ await assertSchedulerSafeCommandAuthorized({
216
+ commandId: schedule.targetCommand,
217
+ actorUserId,
218
+ tenantId: schedule.tenantId,
219
+ organizationId: schedule.organizationId,
220
+ rbacService,
221
+ })
208
222
 
209
223
  const commandInput = {
210
224
  ...((schedule.targetPayload as Record<string, unknown>) || {}),
@@ -212,6 +226,7 @@ export default async function executeScheduleWorker(
212
226
  organizationId: schedule.organizationId,
213
227
  }
214
228
 
229
+ // Build the schedule-scoped command context after the allowlist/RBAC gate.
215
230
  const commandCtx = buildScheduledCommandContext(schedule, ctx as unknown as AppContainer)
216
231
 
217
232
  const commandResult = await commandBus.execute(schedule.targetCommand, {