diff --git a/package.json b/package.json index d2cbf7f6..860ccb57 100644 --- a/package.json +++ b/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", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b55a9d0b..f02a6f84 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -197,6 +197,9 @@ dependencies: crc: specifier: ^4.3.2 version: 4.3.2 + cron-parser: + specifier: ^4.9.0 + version: 4.9.0 cron-validator: specifier: ^1.3.1 version: 1.3.1 @@ -251,6 +254,9 @@ dependencies: emojilib: specifier: ^3.0.10 version: 3.0.10 + event-cron-parser: + specifier: ^1.0.34 + version: 1.0.34 exif-be-gone: specifier: ^1.5.1 version: 1.5.1 @@ -7621,6 +7627,13 @@ packages: '@egjs/list-differ': 1.0.1 dev: false + /cron-parser@4.9.0: + resolution: {integrity: sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==} + engines: {node: '>=12.0.0'} + dependencies: + luxon: 3.5.0 + dev: false + /cron-validator@1.3.1: resolution: {integrity: sha512-C1HsxuPCY/5opR55G5/WNzyEGDWFVG+6GLrA+fW/sCTcP6A6NTjUP2AK7B8n2PyFs90kDG2qzwm8LMheADku6A==} dev: false @@ -8872,6 +8885,12 @@ packages: resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} engines: {node: '>=0.10.0'} + /event-cron-parser@1.0.34: + resolution: {integrity: sha512-ytqZmMrNfSvzHWriiHdoNOpYKFr4d2fDoC4Rgq0F8lEA37abCWkYhSsqslC/kngWwnTGq7L0Q9VlMreKe6EJbQ==} + dependencies: + number-to-words: 1.2.4 + dev: false + /event-stream@3.3.4: resolution: {integrity: sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==} dependencies: @@ -10658,6 +10677,7 @@ packages: /jsesc@2.5.2: resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==} engines: {node: '>=4'} + hasBin: true /jsesc@3.0.2: resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==} @@ -11731,6 +11751,10 @@ packages: dependencies: boolbase: 1.0.0 + /number-to-words@1.2.4: + resolution: {integrity: sha512-/fYevVkXRcyBiZDg6yzZbm0RuaD6i0qRfn8yr+6D0KgBMOndFPxuW10qCHpzs50nN8qKuv78k8MuotZhcVX6Pw==} + dev: false + /nwsapi@2.2.7: resolution: {integrity: sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==} dev: true @@ -15886,6 +15910,7 @@ packages: /yamljs@0.3.0: resolution: {integrity: sha512-C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ==} + hasBin: true dependencies: argparse: 1.0.10 glob: 7.2.3 diff --git a/src/tools/crontab-generator/crontab-generator.service.test.ts b/src/tools/crontab-generator/crontab-generator.service.test.ts new file mode 100644 index 00000000..d45fadfe --- /dev/null +++ b/src/tools/crontab-generator/crontab-generator.service.test.ts @@ -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); + }); + }); +}); diff --git a/src/tools/crontab-generator/crontab-generator.service.ts b/src/tools/crontab-generator/crontab-generator.service.ts new file mode 100644 index 00000000..8e4b7b7e --- /dev/null +++ b/src/tools/crontab-generator/crontab-generator.service.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; +} diff --git a/src/tools/crontab-generator/crontab-generator.vue b/src/tools/crontab-generator/crontab-generator.vue index 97503e7d..4dc48123 100644 --- a/src/tools/crontab-generator/crontab-generator.vue +++ b/src/tools/crontab-generator/crontab-generator.vue @@ -1,11 +1,10 @@ @@ -191,4 +315,12 @@ pre { overflow: auto; padding: 10px 0; } + +.cron-execution-string{ + text-align: center; + font-size: 14px; + opacity: 0.8; + margin: 5px 0 15px; + white-space: pre-wrap; +} diff --git a/src/tools/crontab-generator/get-timezone-offset.d.ts b/src/tools/crontab-generator/get-timezone-offset.d.ts new file mode 100644 index 00000000..3aa8e8db --- /dev/null +++ b/src/tools/crontab-generator/get-timezone-offset.d.ts @@ -0,0 +1,3 @@ +declare module "get-timezone-offset" { + export default function(timeZoneName: string, date: Date); +} diff --git a/src/tools/crontab-generator/index.ts b/src/tools/crontab-generator/index.ts index 7a555b9c..600ac1a0 100644 --- a/src/tools/crontab-generator/index.ts +++ b/src/tools/crontab-generator/index.ts @@ -20,6 +20,7 @@ export const tool = defineTool({ 'day', 'minute', 'second', + 'aws', ], component: () => import('./crontab-generator.vue'), icon: Alarm,