fix(Cron Parser): handle aws, next executions and TZ

Handle AWS Cron syntax and distinguishe from standard syntax (fix CorentinTh#855)
Add show crontab next 5 execution times (taken from CorentinTh#1283)
Add Timezone handling: fix CorentinTh#261

Author: sharevb

components.d.ts

@@ -132,6 +132,7 @@ declare module '@vue/runtime-core' {
     NConfigProvider: typeof import('naive-ui')['NConfigProvider']
     NDivider: typeof import('naive-ui')['NDivider']
     NEllipsis: typeof import('naive-ui')['NEllipsis']
+    NForm: typeof import('naive-ui')['NForm']
     NFormItem: typeof import('naive-ui')['NFormItem']
     NGi: typeof import('naive-ui')['NGi']
     NGrid: typeof import('naive-ui')['NGrid']
@@ -143,8 +144,12 @@ declare module '@vue/runtime-core' {
     NLayout: typeof import('naive-ui')['NLayout']
     NLayoutSider: typeof import('naive-ui')['NLayoutSider']
     NMenu: typeof import('naive-ui')['NMenu']
+    NRadio: typeof import('naive-ui')['NRadio']
+    NRadioGroup: typeof import('naive-ui')['NRadioGroup']
     NScrollbar: typeof import('naive-ui')['NScrollbar']
+    NSpace: typeof import('naive-ui')['NSpace']
     NSpin: typeof import('naive-ui')['NSpin']
+    NSwitch: typeof import('naive-ui')['NSwitch']
     NumeronymGenerator: typeof import('./src/tools/numeronym-generator/numeronym-generator.vue')['default']
     OtpCodeGeneratorAndValidator: typeof import('./src/tools/otp-code-generator-and-validator/otp-code-generator-and-validator.vue')['default']
     PasswordStrengthAnalyser: typeof import('./src/tools/password-strength-analyser/password-strength-analyser.vue')['default']
@@ -159,6 +164,7 @@ declare module '@vue/runtime-core' {
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     RsaKeyPairGenerator: typeof import('./src/tools/rsa-key-pair-generator/rsa-key-pair-generator.vue')['default']
+    SafelinkDecoder: typeof import('./src/tools/safelink-decoder/safelink-decoder.vue')['default']
     SlugifyString: typeof import('./src/tools/slugify-string/slugify-string.vue')['default']
     SpanCopyable: typeof import('./src/components/SpanCopyable.vue')['default']
     SqlPrettify: typeof import('./src/tools/sql-prettify/sql-prettify.vue')['default']

package.json

@@ -51,16 +51,20 @@
     "change-case": "^4.1.2",
     "colord": "^2.9.3",
     "composerize-ts": "^0.6.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",
     "date-fns": "^2.29.3",
     "dompurify": "^3.0.6",
     "emojilib": "^3.0.10",
+    "event-cron-parser": "^1.0.34",
     "figlet": "^1.7.0",
     "figue": "^1.2.0",
     "fuse.js": "^6.6.2",
+    "get-timezone-offset": "^1.0.5",
     "highlight.js": "^11.7.0",
     "iarna-toml-esm": "^3.0.5",
     "ibantools": "^4.3.3",

pnpm-lock.yaml

@@ -1,7 +1,8 @@
 import { useRouteQuery } from '@vueuse/router';
 import { computed } from 'vue';
+import { useStorage } from '@vueuse/core';
 
-export { useQueryParam };
+export { useQueryParam, useQueryParamOrStorage };
 
 const transformers = {
   number: {
@@ -16,6 +17,12 @@ const transformers = {
     fromQuery: (value: string) => value.toLowerCase() === 'true',
     toQuery: (value: boolean) => (value ? 'true' : 'false'),
   },
+  object: {
+    fromQuery: (value: string) => {
+      return JSON.parse(value);
+    },
+    toQuery: (value: object) => JSON.stringify(value),
+  },
 };
 
 function useQueryParam<T>({ name, defaultValue }: { name: string; defaultValue: T }) {
@@ -33,3 +40,27 @@ function useQueryParam<T>({ name, defaultValue }: { name: string; defaultValue:
     },
   });
 }
+
+function useQueryParamOrStorage<T>({ name, storageName, defaultValue }: { name: string; storageName: string; defaultValue: T }) {
+  const type = typeof defaultValue;
+  const transformer = transformers[type as keyof typeof transformers] ?? transformers.string;
+
+  const storageRef = useStorage(storageName, defaultValue);
+  const proxyDefaultValue = transformer.toQuery(defaultValue as never);
+  const proxy = useRouteQuery(name, proxyDefaultValue);
+
+  const r = ref(defaultValue);
+
+  watch(r,
+    (value) => {
+      proxy.value = transformer.toQuery(value as never);
+      storageRef.value = value as never;
+    },
+    { deep: true });
+
+  r.value = (proxy.value && proxy.value !== proxyDefaultValue
+    ? transformer.fromQuery(proxy.value) as unknown as T
+    : storageRef.value as T) as never;
+
+  return r;
+}

src/composable/queryParams.ts

@@ -0,0 +1,44 @@
+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', () => {
+      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 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,44 @@
+import { parseExpression } from 'cron-parser';
+import EventCronParser from 'event-cron-parser';
+
+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(v: string) {
+  return !!getCronType(v);
+}
+
+export function getCronType(v: string) {
+  try {
+    parseExpression(v);
+    return 'standard';
+  }
+  catch (_) {
+    try {
+      const parsed = new EventCronParser(v);
+      parsed.validate();
+      return 'aws';
+    }
+    catch (_) {
+    }
+  }
+  return false;
+}