Merge branch 'fix/crontab-enh' into chore/all-my-stuffs

# Conflicts:
#	package.json
#	pnpm-lock.yaml

Author: sharevb

package.json

@@ -117,6 +117,9 @@
     "convert": "^5.4.1",
     "country-code-lookup": "^0.1.0",
     "crc": "^4.3.2",
+    "countries-and-timezones": "^3.6.0",
+    "country-code-lookup": "^0.1.0",
+    "cron-parser": "^4.9.0",
     "cron-validator": "^1.3.1",
     "cronstrue": "^2.26.0",
     "crypto-js": "^4.1.1",
@@ -138,6 +141,7 @@
     "emojilib": "^3.0.10",
     "fast_array_intersect": "^1.1.0",
     "exif-be-gone": "^1.5.1",
+    "event-cron-parser": "^1.0.34",
     "figlet": "^1.7.0",
     "figue": "^1.2.0",
     "flatten-anything": "^4.0.1",

pnpm-lock.yaml

@@ -0,0 +1,63 @@
+import { describe, expect, it } from 'vitest';
+import { getCronType, getLastExecutionTimes, isCronValid } from './crontab-generator.service';
+
+describe('crontab-generator', () => {
+  describe('isCronValid', () => {
+    it('should return true for all valid formats', () => {
+      // standard format
+      expect(isCronValid('0 0 * * 1-5')).toBe(true);
+      expect(isCronValid('23 0-20/2 * * *')).toBe(true);
+
+      // AWS formats
+      expect(isCronValid('0 11-22 ? * MON-FRI *')).toBe(true);
+      expect(isCronValid('0 0 ? * 1 *')).toBe(true);
+    });
+    it('should check standard format', () => {
+      // standard format
+      expect(isCronValid('0 0 * * 1-5', 'standard')).toBe(true);
+      expect(isCronValid('23 0-20/2 * * *', 'standard')).toBe(true);
+
+      // AWS format
+      expect(isCronValid('0 11-22 ? * MON-FRI *', 'standard')).toBe(false);
+      expect(isCronValid('0 0 ? * 1 *', 'standard')).toBe(false);
+    });
+    it('should check aws format', () => {
+      // standard format
+      expect(isCronValid('0 0 * * 1-5', 'aws')).toBe(false);
+      expect(isCronValid('23 0-20/2 * * *', 'aws')).toBe(false);
+
+      // AWS format
+      expect(isCronValid('0 11-22 ? * MON-FRI *', 'aws')).toBe(true);
+      expect(isCronValid('0 0 ? * 1 *', 'aws')).toBe(true);
+    });
+    it('should return false for all invalid formats', () => {
+      expect(isCronValid('aert')).toBe(false);
+      expect(isCronValid('40 *')).toBe(false);
+    });
+  });
+
+  describe('getCronType', () => {
+    it('should return right type', () => {
+      expect(getCronType('0 0 * * 1-5')).toBe('standard');
+      expect(getCronType('23 0-20/2 * * *')).toBe('standard');
+
+      // AWS formats
+      expect(getCronType('0 11-22 ? * MON-FRI *')).toBe('aws');
+      expect(getCronType('0 0 ? * 1 *')).toBe('aws');
+
+      expect(getCronType('aert')).toBe(false);
+      expect(getCronType('40 *')).toBe(false);
+    });
+  });
+
+  describe('getLastExecutionTimes', () => {
+    it('should return next valid datetimes', () => {
+      expect(getLastExecutionTimes('0 0 * * 1-5')).toHaveLength(5);
+      expect(getLastExecutionTimes('23 0-20/2 * * *')).toHaveLength(5);
+
+      // AWS formats
+      expect(getLastExecutionTimes('0 11-22 ? * MON-FRI *')).toHaveLength(5);
+      expect(getLastExecutionTimes('0 0 ? * 1 *')).toHaveLength(5);
+    });
+  });
+});

src/tools/crontab-generator/crontab-generator.service.test.ts

@@ -0,0 +1,47 @@
+import { parseExpression } from 'cron-parser';
+import EventCronParser from 'event-cron-parser';
+
+export type CronType = 'standard' | 'aws';
+
+export function getLastExecutionTimes(cronExpression: string, tz: string | undefined = undefined, count: number = 5) {
+  if (getCronType(cronExpression) === 'standard') {
+    const interval = parseExpression(cronExpression, { tz });
+    const times = [];
+    for (let i = 0; i < count; i++) {
+      times.push(interval.next().toJSON());
+    }
+    return times;
+  }
+  if (getCronType(cronExpression) === 'aws') {
+    const parsed = new EventCronParser(cronExpression);
+    const times = [];
+    for (let i = 0; i < count; i++) {
+      times.push(JSON.stringify(parsed.next()));
+    }
+    return times;
+  }
+
+  return [];
+}
+
+export function isCronValid(cronExpression: string, cronType: CronType | 'any' = 'any') {
+  const expressionCronType = getCronType(cronExpression);
+  return cronType === 'any' ? !!expressionCronType : expressionCronType === cronType;
+}
+
+export function getCronType(cronExpression: string) {
+  try {
+    parseExpression(cronExpression);
+    return 'standard';
+  }
+  catch (_) {
+    try {
+      const parsed = new EventCronParser(cronExpression);
+      parsed.validate();
+      return 'aws';
+    }
+    catch (_) {
+    }
+  }
+  return false;
+}