mirror of
https://github.com/n8n-io/n8n.git
synced 2024-12-25 04:34:06 -08:00
fix(core): Ensure waiting executions account for workflow timezone (#8340)
This commit is contained in:
parent
d4c93b1607
commit
3734c89cf6
|
@ -57,6 +57,7 @@
|
||||||
"file-type": "16.5.4",
|
"file-type": "16.5.4",
|
||||||
"form-data": "4.0.0",
|
"form-data": "4.0.0",
|
||||||
"lodash": "4.17.21",
|
"lodash": "4.17.21",
|
||||||
|
"luxon": "^3.4.4",
|
||||||
"mime-types": "2.1.35",
|
"mime-types": "2.1.35",
|
||||||
"n8n-workflow": "workspace:*",
|
"n8n-workflow": "workspace:*",
|
||||||
"oauth-1.0a": "2.2.6",
|
"oauth-1.0a": "2.2.6",
|
||||||
|
|
|
@ -151,6 +151,7 @@ import Container from 'typedi';
|
||||||
import type { BinaryData } from './BinaryData/types';
|
import type { BinaryData } from './BinaryData/types';
|
||||||
import merge from 'lodash/merge';
|
import merge from 'lodash/merge';
|
||||||
import { InstanceSettings } from './InstanceSettings';
|
import { InstanceSettings } from './InstanceSettings';
|
||||||
|
import { toUtcDate } from './utils';
|
||||||
|
|
||||||
axios.defaults.timeout = 300000;
|
axios.defaults.timeout = 300000;
|
||||||
// Prevent axios from adding x-form-www-urlencoded headers by default
|
// Prevent axios from adding x-form-www-urlencoded headers by default
|
||||||
|
@ -3489,7 +3490,7 @@ export function getExecuteFunctions(
|
||||||
binaryToBuffer: async (body: Buffer | Readable) =>
|
binaryToBuffer: async (body: Buffer | Readable) =>
|
||||||
Container.get(BinaryDataService).toBuffer(body),
|
Container.get(BinaryDataService).toBuffer(body),
|
||||||
async putExecutionToWait(waitTill: Date): Promise<void> {
|
async putExecutionToWait(waitTill: Date): Promise<void> {
|
||||||
runExecutionData.waitTill = waitTill;
|
runExecutionData.waitTill = toUtcDate(waitTill, getTimezone(workflow));
|
||||||
if (additionalData.setExecutionStatus) {
|
if (additionalData.setExecutionStatus) {
|
||||||
additionalData.setExecutionStatus('waiting');
|
additionalData.setExecutionStatus('waiting');
|
||||||
}
|
}
|
||||||
|
|
5
packages/core/src/utils.ts
Normal file
5
packages/core/src/utils.ts
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
import { DateTime } from 'luxon';
|
||||||
|
|
||||||
|
export function toUtcDate(datetime: Date, tz: string) {
|
||||||
|
return DateTime.fromISO(datetime.toISOString().slice(0, -1), { zone: tz }).toUTC().toJSDate();
|
||||||
|
}
|
35
packages/core/test/utils.test.ts
Normal file
35
packages/core/test/utils.test.ts
Normal file
|
@ -0,0 +1,35 @@
|
||||||
|
import { toUtcDate } from '@/utils';
|
||||||
|
|
||||||
|
describe('utils', () => {
|
||||||
|
describe('toUtcDate()', () => {
|
||||||
|
test('should convert to UTC date by adding', () => {
|
||||||
|
const originalDate = new Date('2020-01-01T00:00:00.000Z');
|
||||||
|
const timezone = 'America/New_York'; // +5 to reach Z
|
||||||
|
|
||||||
|
const utcDate = toUtcDate(originalDate, timezone);
|
||||||
|
|
||||||
|
expect(utcDate).toBeInstanceOf(Date);
|
||||||
|
expect(utcDate.toISOString()).toBe('2020-01-01T05:00:00.000Z');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('should convert to UTC date by subtracting', () => {
|
||||||
|
const originalDate = new Date('2020-01-01T00:00:00.000Z');
|
||||||
|
const timezone = 'Europe/Paris'; // -1 to reach Z
|
||||||
|
|
||||||
|
const utcDate = toUtcDate(originalDate, timezone);
|
||||||
|
|
||||||
|
expect(utcDate).toBeInstanceOf(Date);
|
||||||
|
expect(utcDate.toISOString()).toBe('2019-12-31T23:00:00.000Z');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('should convert to UTC date when already UTC', () => {
|
||||||
|
const originalDate = new Date('2020-01-01T00:00:00.000Z');
|
||||||
|
const timezone = 'UTC'; // already at Z
|
||||||
|
|
||||||
|
const utcDate = toUtcDate(originalDate, timezone);
|
||||||
|
|
||||||
|
expect(utcDate).toBeInstanceOf(Date);
|
||||||
|
expect(utcDate.toISOString()).toBe('2020-01-01T00:00:00.000Z');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
|
@ -767,6 +767,9 @@ importers:
|
||||||
lodash:
|
lodash:
|
||||||
specifier: 4.17.21
|
specifier: 4.17.21
|
||||||
version: 4.17.21
|
version: 4.17.21
|
||||||
|
luxon:
|
||||||
|
specifier: ^3.4.4
|
||||||
|
version: 3.4.4
|
||||||
mime-types:
|
mime-types:
|
||||||
specifier: 2.1.35
|
specifier: 2.1.35
|
||||||
version: 2.1.35
|
version: 2.1.35
|
||||||
|
@ -19831,6 +19834,11 @@ packages:
|
||||||
engines: {node: '>=12'}
|
engines: {node: '>=12'}
|
||||||
dev: false
|
dev: false
|
||||||
|
|
||||||
|
/luxon@3.4.4:
|
||||||
|
resolution: {integrity: sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==}
|
||||||
|
engines: {node: '>=12'}
|
||||||
|
dev: false
|
||||||
|
|
||||||
/lz-string@1.5.0:
|
/lz-string@1.5.0:
|
||||||
resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==}
|
resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
Loading…
Reference in a new issue