mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-11-09 22:24:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(Schedule Trigger Node): Fixes inconsitent behavior with cron and weekly intervals (#4558)

Browse source 
* 🐛 Fixes weekly schedule trigger and inconsitent behavior from Cron

* 🐛  Explicitly check if number of items is undefined

* 🐛 Add flag for first time execution

* Fix merge issues

* 🎨 Decomplexise logic for week interval

* fix: account for periods longer than minimum interval and first executions

Co-authored-by: Omar Ajoue <krynble@gmail.com>
This commit is contained in:
agobrech 2022-11-21 10:32:23 +01:00 committed by GitHub
parent a6df51b6e8
commit 2fb8ed825b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts
View file

@ -415,7 +415,13 @@ export class ScheduleTrigger implements INodeType {
const timezone = this.getTimezone(); const timezone = this.getTimezone();
const cronJobs: CronJob[] = []; const cronJobs: CronJob[] = [];
const intervalArr: NodeJS.Timeout[] = []; const intervalArr: NodeJS.Timeout[] = [];
const executeTrigger = () => { const staticData = this.getWorkflowStaticData('node') as {
recurrencyRules: number[];
};
if (!staticData.recurrencyRules) {
staticData.recurrencyRules = [];
}
const executeTrigger = (recurrencyRuleIndex?: number, weeksInterval?: number) => {
const resultData = { const resultData = {
timestamp: moment.tz(timezone).toISOString(true), timestamp: moment.tz(timezone).toISOString(true),
'Readable date': moment.tz(timezone).format('MMMM Do YYYY, h:mm:ss a'), 'Readable date': moment.tz(timezone).format('MMMM Do YYYY, h:mm:ss a'),
@ -429,8 +435,27 @@ export class ScheduleTrigger implements INodeType {
Second: moment.tz(timezone).format('ss'), Second: moment.tz(timezone).format('ss'),
Timezone: moment.tz(timezone).format('z Z'), Timezone: moment.tz(timezone).format('z Z'),
}; };
this.emit([this.helpers.returnJsonArray([resultData])]); const lastExecutionWeekNumber =
recurrencyRuleIndex !== undefined
? staticData.recurrencyRules[recurrencyRuleIndex]
: undefined;
// Checks if have the right week interval, handles new years as well
if (weeksInterval && recurrencyRuleIndex !== undefined) {
if (
lastExecutionWeekNumber === undefined || // First time executing this rule
moment.tz(timezone).week() >= weeksInterval + lastExecutionWeekNumber || // not first time, but minimum interval has passed
moment.tz(timezone).week() + 52 >= weeksInterval + lastExecutionWeekNumber // not first time, correct interval but year has passed
) {
staticData.recurrencyRules[recurrencyRuleIndex] = moment.tz(timezone).week();
this.emit([this.helpers.returnJsonArray([resultData])]);
}
// There is no else block here since we don't want to emit anything now
} else {
this.emit([this.helpers.returnJsonArray([resultData])]);
}
}; };
for (let i = 0; i < interval.length; i++) { for (let i = 0; i < interval.length; i++) {
let intervalValue = 1000; let intervalValue = 1000;
if (interval[i].field === 'cronExpression') { if (interval[i].field === 'cronExpression') {
@ -484,10 +509,21 @@ export class ScheduleTrigger implements INodeType {
const week = interval[i].weeksInterval as number; const week = interval[i].weeksInterval as number;
const days = interval[i].triggerAtDay as IDataObject[]; const days = interval[i].triggerAtDay as IDataObject[];
const day = days.length === 0 ? '*' : (days.join(',') as string); const day = days.length === 0 ? '*' : (days.join(',') as string);
const cronTimes: string[] = [minute, hour, `*/${week * 7}`, '*', day]; const cronTimes: string[] = [minute, hour, '*', '*', day];
const cronExpression = cronTimes.join(' '); const cronExpression = cronTimes.join(' ');
const cronJob = new CronJob(cronExpression, executeTrigger, undefined, true, timezone); if (week === 1) {
cronJobs.push(cronJob); const cronJob = new CronJob(cronExpression, executeTrigger, undefined, true, timezone);
cronJobs.push(cronJob);
} else {
const cronJob = new CronJob(
cronExpression,
() => executeTrigger(i, week),
undefined,
true,
timezone,
);
cronJobs.push(cronJob);
}
} }
if (interval[i].field === 'months') { if (interval[i].field === 'months') {