@useparagon/core 1.0.8-canary.4 → 1.0.8-canary.5
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.
|
@@ -38,14 +38,16 @@ const getCronOptions = (schedule, timezone = 'America/Los_Angeles') => {
|
|
|
38
38
|
}
|
|
39
39
|
};
|
|
40
40
|
exports.getCronOptions = getCronOptions;
|
|
41
|
-
const
|
|
41
|
+
const extractValue = (cronExpression, index, withSecondExpression) => {
|
|
42
42
|
const expressionParts = cronExpression.split(' ');
|
|
43
|
-
|
|
44
|
-
? expressionParts
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
43
|
+
const part = withSecondExpression
|
|
44
|
+
? expressionParts.length === 5
|
|
45
|
+
? ''
|
|
46
|
+
: expressionParts[index]
|
|
47
|
+
: expressionParts.length === 5
|
|
48
|
+
? expressionParts[index]
|
|
49
|
+
: expressionParts[index + 1];
|
|
50
|
+
return part.replace('*/', '');
|
|
49
51
|
};
|
|
50
52
|
const validateRange = (value, min, max, name, cron) => {
|
|
51
53
|
if (isNaN(value) || value < min || value > max) {
|
|
@@ -53,7 +55,7 @@ const validateRange = (value, min, max, name, cron) => {
|
|
|
53
55
|
}
|
|
54
56
|
return true;
|
|
55
57
|
};
|
|
56
|
-
const validateSeconds = (cron) => validateRange(parseInt(extractValue(cron, 0)), 0, 59, 'seconds', cron);
|
|
58
|
+
const validateSeconds = (cron) => validateRange(parseInt(extractValue(cron, 0, true)), 0, 59, 'seconds', cron);
|
|
57
59
|
const validateMinutes = (cron) => validateRange(parseInt(extractValue(cron, 1)), 0, 59, 'minutes', cron);
|
|
58
60
|
const validateHours = (cron) => validateRange(parseInt(extractValue(cron, 2)), 1, 23, 'hours', cron);
|
|
59
61
|
const validateDays = (cron) => validateRange(parseInt(extractValue(cron, 2)), 1, 31, 'days', cron);
|
|
@@ -73,7 +75,7 @@ const getSchedule = (cron, timezone = 'America/Los_Angeles') => {
|
|
|
73
75
|
const secondIteration = parser.next().toDate();
|
|
74
76
|
const diffSeconds = Math.floor((secondIteration.getTime() - firstIteration.getTime()) / 1000);
|
|
75
77
|
if (diffSeconds < 60 || (diffSeconds === 60 && validateSeconds(cron))) {
|
|
76
|
-
const secondsFromExpression = parseInt(extractValue(cron, 0));
|
|
78
|
+
const secondsFromExpression = parseInt(extractValue(cron, 0, true));
|
|
77
79
|
return {
|
|
78
80
|
unit: cron_interface_1.Unit.SECONDS,
|
|
79
81
|
seconds: secondsFromExpression,
|
|
@@ -81,7 +83,7 @@ const getSchedule = (cron, timezone = 'America/Los_Angeles') => {
|
|
|
81
83
|
}
|
|
82
84
|
const diffMinutes = Math.floor(diffSeconds / 60);
|
|
83
85
|
if (diffMinutes < 60 || (diffMinutes === 60 && validateMinutes(cron))) {
|
|
84
|
-
const minutesFromExpression = parseInt(extractValue(cron,
|
|
86
|
+
const minutesFromExpression = parseInt(extractValue(cron, 0));
|
|
85
87
|
return {
|
|
86
88
|
unit: cron_interface_1.Unit.MINUTES,
|
|
87
89
|
minutes: minutesFromExpression,
|
|
@@ -89,8 +91,8 @@ const getSchedule = (cron, timezone = 'America/Los_Angeles') => {
|
|
|
89
91
|
}
|
|
90
92
|
const diffHours = Math.floor(diffMinutes / 60);
|
|
91
93
|
if (diffHours < 24 || (diffHours === 24 && validateHours(cron))) {
|
|
92
|
-
const minuteFromExpression = parseInt(extractValue(cron,
|
|
93
|
-
const hoursFromExpression = parseInt(extractValue(cron,
|
|
94
|
+
const minuteFromExpression = parseInt(extractValue(cron, 0));
|
|
95
|
+
const hoursFromExpression = parseInt(extractValue(cron, 1));
|
|
94
96
|
const offset = isNaN(minuteFromExpression) ? 1 : minuteFromExpression;
|
|
95
97
|
return offset % 5 === 0
|
|
96
98
|
? {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron.utils.js","sourceRoot":"","sources":["../../../src/triggers/cron/cron.utils.ts"],"names":[],"mappings":";;;AAAA,6CAA8D;AAE9D,qDAA2D;AAOpD,MAAM,cAAc,GAAG,CAC5B,QAAkB,EAClB,QAAQ,GAAG,qBAAqB,EACK,EAAE;IACvC,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtB,KAAK,qBAAI,CAAC,OAAO;YACf,OAAO,EAAE,IAAI,EAAE,KAAK,QAAQ,CAAC,OAAO,YAAY,EAAE,CAAC;QACrD,KAAK,qBAAI,CAAC,OAAO;YACf,OAAO;gBACL,IAAI,EAAE,OAAO,QAAQ,CAAC,OAAO,UAAU;aACxC,CAAC;QACJ,KAAK,qBAAI,CAAC,MAAM;YACd,OAAO;gBACL,IAAI,EAAE,KAAK,QAAQ,CAAC,MAAM,MAAM,QAAQ,CAAC,KAAK,QAAQ;aACvD,CAAC;QACJ,KAAK,qBAAI,CAAC,KAAK;YACb,MAAM,YAAY,GAAW,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;YACxD,MAAM,UAAU,GAAW,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;YAClE,OAAO;gBACL,IAAI,EAAE,KAAK,YAAY,IAAI,UAAU,MAAM,QAAQ,CAAC,IAAI,MAAM;gBAC9D,QAAQ;aACT,CAAC;QACJ,KAAK,qBAAI,CAAC,MAAM;YACd,MAAM,aAAa,GAAW,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;YACzD,MAAM,WAAW,GAAW,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;YACnE,MAAM,aAAa,GACjB,MAAM,CAAC,IAAI,CAAC,wBAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACrD,OAAO;gBACL,IAAI,EAAE,KAAK,aAAa,IAAI,WAAW,QAAQ,aAAa,EAAE;gBAC9D,QAAQ;aACT,CAAC;QACJ,KAAK,qBAAI,CAAC,MAAM;YACd,OAAO;gBACL,IAAI,EAAE,QAAQ,CAAC,UAAU;gBACzB,QAAQ;aACT,CAAC;IACN,CAAC;AACH,CAAC,CAAC;AArCW,QAAA,cAAc,kBAqCzB;
|
|
1
|
+
{"version":3,"file":"cron.utils.js","sourceRoot":"","sources":["../../../src/triggers/cron/cron.utils.ts"],"names":[],"mappings":";;;AAAA,6CAA8D;AAE9D,qDAA2D;AAOpD,MAAM,cAAc,GAAG,CAC5B,QAAkB,EAClB,QAAQ,GAAG,qBAAqB,EACK,EAAE;IACvC,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtB,KAAK,qBAAI,CAAC,OAAO;YACf,OAAO,EAAE,IAAI,EAAE,KAAK,QAAQ,CAAC,OAAO,YAAY,EAAE,CAAC;QACrD,KAAK,qBAAI,CAAC,OAAO;YACf,OAAO;gBACL,IAAI,EAAE,OAAO,QAAQ,CAAC,OAAO,UAAU;aACxC,CAAC;QACJ,KAAK,qBAAI,CAAC,MAAM;YACd,OAAO;gBACL,IAAI,EAAE,KAAK,QAAQ,CAAC,MAAM,MAAM,QAAQ,CAAC,KAAK,QAAQ;aACvD,CAAC;QACJ,KAAK,qBAAI,CAAC,KAAK;YACb,MAAM,YAAY,GAAW,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;YACxD,MAAM,UAAU,GAAW,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;YAClE,OAAO;gBACL,IAAI,EAAE,KAAK,YAAY,IAAI,UAAU,MAAM,QAAQ,CAAC,IAAI,MAAM;gBAC9D,QAAQ;aACT,CAAC;QACJ,KAAK,qBAAI,CAAC,MAAM;YACd,MAAM,aAAa,GAAW,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;YACzD,MAAM,WAAW,GAAW,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;YACnE,MAAM,aAAa,GACjB,MAAM,CAAC,IAAI,CAAC,wBAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACrD,OAAO;gBACL,IAAI,EAAE,KAAK,aAAa,IAAI,WAAW,QAAQ,aAAa,EAAE;gBAC9D,QAAQ;aACT,CAAC;QACJ,KAAK,qBAAI,CAAC,MAAM;YACd,OAAO;gBACL,IAAI,EAAE,QAAQ,CAAC,UAAU;gBACzB,QAAQ;aACT,CAAC;IACN,CAAC;AACH,CAAC,CAAC;AArCW,QAAA,cAAc,kBAqCzB;AACF,MAAM,YAAY,GAAG,CACnB,cAAsB,EACtB,KAAa,EACb,oBAA8B,EAC9B,EAAE;IACF,MAAM,eAAe,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAGlD,MAAM,IAAI,GAAG,oBAAoB;QAC/B,CAAC,CAAC,eAAe,CAAC,MAAM,KAAK,CAAC;YAC5B,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC;QAC1B,CAAC,CAAC,eAAe,CAAC,MAAM,KAAK,CAAC;YAC5B,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC;YACxB,CAAC,CAAC,eAAe,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;IAGjC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AAChC,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CACpB,KAAa,EACb,GAAW,EACX,GAAW,EACX,IAAY,EACZ,IAAY,EACZ,EAAE;IACF,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,GAAG,IAAI,KAAK,GAAG,GAAG,EAAE,CAAC;QAC/C,MAAM,IAAI,KAAK,CACb,WAAW,IAAI,8BAA8B,IAAI,gCAAgC,GAAG,QAAQ,GAAG,GAAG,CACnG,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,EAAE,CACvC,aAAa,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;AAE/E,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,EAAE,CACvC,aAAa,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;AAEzE,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,EAAE,CACrC,aAAa,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;AAEvE,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,EAAE,CACpC,aAAa,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;AAEtE,MAAM,kBAAkB,GAAG,CAAC,cAAsB,EAAE,EAAE;IACpD,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACxC,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACxE,CAAC,CAAC;AAMK,MAAM,WAAW,GAAG,CACzB,IAAY,EACZ,WAAmB,qBAAqB,EAC9B,EAAE;IACZ,IAAI,MAAsB,CAAC;IAC3B,IAAI,CAAC;QACH,MAAM,GAAG,IAAA,6BAAe,EAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CACb,wDAAwD,IAAI,MACzD,GAAW,CAAC,OACf,EAAE,CACH,CAAC;IACJ,CAAC;IACD,MAAM,cAAc,GAAS,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;IACpD,MAAM,eAAe,GAAS,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;IAErD,MAAM,WAAW,GAAW,IAAI,CAAC,KAAK,CACpC,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,cAAc,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAC9D,CAAC;IACF,IAAI,WAAW,GAAG,EAAE,IAAI,CAAC,WAAW,KAAK,EAAE,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QACtE,MAAM,qBAAqB,GAAG,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;QAEpE,OAAO;YACL,IAAI,EAAE,qBAAI,CAAC,OAAO;YAClB,OAAO,EAAE,qBAAqB;SAC/B,CAAC;IACJ,CAAC;IACD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC;IACjD,IAAI,WAAW,GAAG,EAAE,IAAI,CAAC,WAAW,KAAK,EAAE,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QACtE,MAAM,qBAAqB,GAAG,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAE9D,OAAO;YACL,IAAI,EAAE,qBAAI,CAAC,OAAO;YAClB,OAAO,EAAE,qBAAqB;SAC/B,CAAC;IACJ,CAAC;IACD,MAAM,SAAS,GAAW,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC;IACvD,IAAI,SAAS,GAAG,EAAE,IAAI,CAAC,SAAS,KAAK,EAAE,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QAChE,MAAM,oBAAoB,GAAG,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7D,MAAM,mBAAmB,GAAG,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAE5D,MAAM,MAAM,GAAG,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC;QAEtE,OAAO,MAAM,GAAG,CAAC,KAAK,CAAC;YACrB,CAAC,CAAC;gBACE,IAAI,EAAE,qBAAI,CAAC,MAAM;gBACjB,KAAK,EAAE,mBAAmB;gBAC1B,MAAM;aACP;YACH,CAAC,CAAC,EAAE,IAAI,EAAE,qBAAI,CAAC,MAAM,EAAE,UAAU,EAAE,kBAAkB,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC;IAC5E,CAAC;IAED,MAAM,QAAQ,GAAW,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,EAAE,CAAC,CAAC;IACpD,MAAM,OAAO,GACX,cAAc,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC,UAAU,EAAE,CAAC;IAE/D,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;QACnB,YAAY,CAAC,IAAI,CAAC,CAAC;QACnB,OAAO,OAAO,GAAG,EAAE,KAAK,CAAC;YACvB,CAAC,CAAC;gBACE,IAAI,EAAE,qBAAI,CAAC,KAAK;gBAChB,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE;oBACJ,OAAO;oBACP,QAAQ;iBACT;aACF;YACH,CAAC,CAAC,EAAE,IAAI,EAAE,qBAAI,CAAC,MAAM,EAAE,UAAU,EAAE,kBAAkB,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC;IAC5E,CAAC;IAED,MAAM,OAAO,GAAY,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE;QACxD,OAAO,EAAE,MAAM;KAChB,CAAC;SACC,MAAM,CAAC,cAAc,CAAC;SACtB,WAAW,EAAa,CAAC;IAE5B,OAAO,OAAO,GAAG,EAAE,KAAK,CAAC;QACvB,CAAC,CAAC;YACE,IAAI,EAAE,qBAAI,CAAC,MAAM;YACjB,OAAO;YACP,IAAI,EAAE;gBACJ,OAAO;gBACP,QAAQ,EAAE,QAAQ;aACnB;SACF;QACH,CAAC,CAAC,EAAE,IAAI,EAAE,qBAAI,CAAC,MAAM,EAAE,UAAU,EAAE,kBAAkB,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC;AAC5E,CAAC,CAAC;AAvFW,QAAA,WAAW,eAuFtB"}
|