Merge pull request #873 from balena-io/joshbwlng/cron-parser

Update cron-parser to v5

Author: flowzone-app[bot]

package.json

@@ -55,7 +55,7 @@
     "ajv": "^8.17.1",
     "busboy": "^1.6.0",
     "commander": "^13.1.0",
-    "cron-parser": "^4.9.0",
+    "cron-parser": "^5.0.6",
     "deep-freeze": "^0.0.1",
     "eventemitter3": "^5.0.1",
     "express-session": "^1.18.1",

src/tasks/index.ts

@@ -1,5 +1,5 @@
 import type { Schema } from 'ajv';
-import cronParser from 'cron-parser';
+import { CronExpressionParser } from 'cron-parser';
 import { tasks as tasksEnv } from '../config-loader/env.js';
 import { addPureHook } from '../sbvr-api/hooks.js';
 import * as sbvrUtils from '../sbvr-api/sbvr-utils.js';
@@ -77,11 +77,12 @@ export function setup(): void {
 				request.values.is_scheduled_to_execute_on__time == null
 			) {
 				try {
-					request.values.is_scheduled_to_execute_on__time = cronParser
-						.parseExpression(request.values.is_scheduled_with__cron_expression)
-						.next()
-						.toDate()
-						.toISOString();
+					request.values.is_scheduled_to_execute_on__time =
+						CronExpressionParser.parse(
+							request.values.is_scheduled_with__cron_expression,
+						)
+							.next()
+							.toISOString();
 				} catch {
 					throw new Error(
 						`Invalid cron expression: ${request.values.is_scheduled_with__cron_expression}`,

test/08-tasks.test.ts

@@ -6,7 +6,7 @@ import { PineTest } from 'pinejs-client-supertest';
 import { testInit, testDeInit, testLocalServer } from './lib/test-init.js';
 import { env } from '@balena/pinejs';
 import type Model from '@balena/pinejs/out/tasks/tasks.js';
-import cronParser from 'cron-parser';
+import { CronExpressionParser } from 'cron-parser';
 import { PINE_TEST_SIGNALS } from './lib/common.js';
 
 const actorId = 1;
@@ -241,7 +241,7 @@ describe('08 task tests', function () {
 		it('should set scheduled execution time when cron expression is provided', async () => {
 			// Create a task to create a new device record in 3s
 			const cron = '0 0 2,8,12,14 * * *';
-			const expectedSchedule = cronParser.parseExpression(cron).next().toDate();
+			const expectedSchedule = CronExpressionParser.parse(cron).next().toDate();
 			const task = await createTask(pineTest, apikey, {
 				is_executed_by__handler: 'create_device',
 				is_executed_with__parameter_set: {
@@ -363,8 +363,7 @@ describe('08 task tests', function () {
 					},
 				});
 
-				const nextExecutionDate = cronParser
-					.parseExpression(cron)
+				const nextExecutionDate = CronExpressionParser.parse(cron)
 					.next()
 					.toISOString();
 				await waitFor(async () => {