@n8n/scheduler 1.4.2 → 1.5.1
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.
- package/README.md +36 -0
- package/dist/build.tsbuildinfo +1 -1
- package/dist/core/executor/executor.d.ts +1 -0
- package/dist/core/executor/executor.js +4 -0
- package/dist/core/executor/executor.js.map +1 -1
- package/dist/core/factory.js +4 -0
- package/dist/core/factory.js.map +1 -1
- package/dist/core/materializer/coalesce-group.d.ts +2 -0
- package/dist/core/materializer/coalesce-group.js +45 -0
- package/dist/core/materializer/coalesce-group.js.map +1 -0
- package/dist/core/materializer/materialize.js +5 -2
- package/dist/core/materializer/materialize.js.map +1 -1
- package/dist/core/materializer/misfire.js +2 -1
- package/dist/core/materializer/misfire.js.map +1 -1
- package/dist/core/materializer/plan.d.ts +1 -0
- package/dist/core/materializer/plan.js +3 -1
- package/dist/core/materializer/plan.js.map +1 -1
- package/dist/core/types/schedule.d.ts +1 -0
- package/dist/observability/metrics.d.ts +1 -0
- package/dist/observability/metrics.js +1 -0
- package/dist/observability/metrics.js.map +1 -1
- package/package.json +6 -6
|
@@ -15,6 +15,7 @@ export interface ExecutorHooks {
|
|
|
15
15
|
onDispatch?: (taskType: string, lagSeconds: number) => void;
|
|
16
16
|
onFire?: (taskType: string, result: 'success' | 'failure') => void;
|
|
17
17
|
onRetry?: (taskType: string) => void;
|
|
18
|
+
onLeaseLost?: (taskType: string) => void;
|
|
18
19
|
}
|
|
19
20
|
export declare class Executor {
|
|
20
21
|
private readonly store;
|
|
@@ -100,6 +100,7 @@ class Executor {
|
|
|
100
100
|
this.hooks.onFire?.(task.taskType, 'success');
|
|
101
101
|
return { outcome: 'completed' };
|
|
102
102
|
}
|
|
103
|
+
this.hooks.onLeaseLost?.(task.taskType);
|
|
103
104
|
return { outcome: 'skipped-not-owned', errorMessage };
|
|
104
105
|
}
|
|
105
106
|
const rowsAffected = await this.store.failTaskTerminal(claim, errorMessage);
|
|
@@ -107,6 +108,7 @@ class Executor {
|
|
|
107
108
|
this.hooks.onFire?.(task.taskType, 'failure');
|
|
108
109
|
return { outcome: 'dead-lettered', errorMessage };
|
|
109
110
|
}
|
|
111
|
+
this.hooks.onLeaseLost?.(task.taskType);
|
|
110
112
|
return { outcome: 'skipped-not-owned', errorMessage };
|
|
111
113
|
}
|
|
112
114
|
const rowsAffected = await this.store.rescheduleTask(claim, (0, backoff_1.backoff)(nextAttempts), errorMessage);
|
|
@@ -114,6 +116,7 @@ class Executor {
|
|
|
114
116
|
this.hooks.onRetry?.(task.taskType);
|
|
115
117
|
return { outcome: 'rescheduled', errorMessage };
|
|
116
118
|
}
|
|
119
|
+
this.hooks.onLeaseLost?.(task.taskType);
|
|
117
120
|
return { outcome: 'skipped-not-owned', errorMessage };
|
|
118
121
|
}
|
|
119
122
|
markDispatched();
|
|
@@ -123,6 +126,7 @@ class Executor {
|
|
|
123
126
|
this.hooks.onFire?.(task.taskType, 'success');
|
|
124
127
|
return { outcome: 'completed' };
|
|
125
128
|
}
|
|
129
|
+
this.hooks.onLeaseLost?.(task.taskType);
|
|
126
130
|
return { outcome: 'skipped-not-owned' };
|
|
127
131
|
}
|
|
128
132
|
async releaseClaimBestEffort(claim) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../src/core/executor/executor.ts"],"names":[],"mappings":";;;AAAA,8CAAsC;AACtC,iEAA6D;AAE7D,uCAAoC;AACpC,uCAA2E;AAG3E,iDAAwD;AAExD,uCAAgD;
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../src/core/executor/executor.ts"],"names":[],"mappings":"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"}
|
package/dist/core/factory.js
CHANGED
|
@@ -130,6 +130,10 @@ function createScheduler(deps) {
|
|
|
130
130
|
metrics.recordDeadLettered();
|
|
131
131
|
}),
|
|
132
132
|
onRetry: (taskType) => recordMetric(() => metrics.recordRetry(taskType)),
|
|
133
|
+
onLeaseLost: (taskType) => {
|
|
134
|
+
recordMetric(() => metrics.recordLeaseLost(taskType));
|
|
135
|
+
emit('warn', 'Scheduler task finished after losing its lease; another instance may have run the same occurrence concurrently', { taskType });
|
|
136
|
+
},
|
|
133
137
|
}, (0, executor_tracing_1.createExecutorTracing)(tracer));
|
|
134
138
|
if (retentionOptions.failedRetentionSeconds < retentionOptions.retentionSeconds) {
|
|
135
139
|
emit('warn', 'Scheduler retention keeps failed runs shorter than succeeded ones; failure evidence will be deleted first', {
|
package/dist/core/factory.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../src/core/factory.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../src/core/factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.applyCoalesceOwnerPolicy = applyCoalesceOwnerPolicy;
|
|
4
|
+
const constants_1 = require("@n8n/constants");
|
|
5
|
+
function applyCoalesceOwnerPolicy(planned) {
|
|
6
|
+
const losers = new Set([...groupByOwner(planned).values()].flatMap((members) => {
|
|
7
|
+
const winner = members.reduce(latestThenLowestId);
|
|
8
|
+
return members.filter((member) => member !== winner).map((member) => member.entry);
|
|
9
|
+
}));
|
|
10
|
+
if (losers.size === 0) {
|
|
11
|
+
return planned;
|
|
12
|
+
}
|
|
13
|
+
return planned.map((entry) => (losers.has(entry) ? dropLateRun(entry) : entry));
|
|
14
|
+
}
|
|
15
|
+
function groupByOwner(planned) {
|
|
16
|
+
return planned
|
|
17
|
+
.flatMap(toOwnedMember)
|
|
18
|
+
.reduce((groups, { key, member }) => groups.set(key, [...(groups.get(key) ?? []), member]), new Map());
|
|
19
|
+
}
|
|
20
|
+
function toOwnedMember(entry) {
|
|
21
|
+
const { job, plan } = entry;
|
|
22
|
+
if (job.ownerKey === null ||
|
|
23
|
+
plan.catchUpAt === null ||
|
|
24
|
+
job.misfirePolicy !== constants_1.ScheduledJobMisfirePolicy.CoalesceOwner) {
|
|
25
|
+
return [];
|
|
26
|
+
}
|
|
27
|
+
return [{ key: job.ownerKey, member: { entry, latestMissedAt: plan.catchUpAt.getTime() } }];
|
|
28
|
+
}
|
|
29
|
+
function latestThenLowestId(current, candidate) {
|
|
30
|
+
if (candidate.latestMissedAt !== current.latestMissedAt) {
|
|
31
|
+
return candidate.latestMissedAt > current.latestMissedAt ? candidate : current;
|
|
32
|
+
}
|
|
33
|
+
return candidate.entry.job.id < current.entry.job.id ? candidate : current;
|
|
34
|
+
}
|
|
35
|
+
function dropLateRun({ job, plan }) {
|
|
36
|
+
return {
|
|
37
|
+
job,
|
|
38
|
+
plan: {
|
|
39
|
+
...plan,
|
|
40
|
+
occurrences: plan.occurrences.slice(1),
|
|
41
|
+
catchUpAt: null,
|
|
42
|
+
},
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
//# sourceMappingURL=coalesce-group.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"coalesce-group.js","sourceRoot":"","sources":["../../../src/core/materializer/coalesce-group.ts"],"names":[],"mappings":";;;AAAA,8CAA2D;AAe3D,kCAAyC,OAAqB;IAC7D,MAAM,MAAM,GAAG,IAAI,GAAG,CACrB,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACvD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAClD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACpF,CAAC,CAAC,CACF,CAAC;IAEF,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,OAAO,CAAC;IAChB,CAAC;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;AACjF,CAAC;AASD,SAAS,YAAY,CAAC,OAAqB;IAC1C,OAAO,OAAO;SACZ,OAAO,CAAC,aAAa,CAAC;SACtB,MAAM,CACN,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,EAClF,IAAI,GAAG,EAAyB,CAChC,CAAC;AACJ,CAAC;AAGD,SAAS,aAAa,CAAC,KAAiB;IACvC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IAC5B,IACC,GAAG,CAAC,QAAQ,KAAK,IAAI;QACrB,IAAI,CAAC,SAAS,KAAK,IAAI;QACvB,GAAG,CAAC,aAAa,KAAK,qCAAyB,CAAC,aAAa,EAC5D,CAAC;QACF,OAAO,EAAE,CAAC;IACX,CAAC;IACD,OAAO,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;AAC7F,CAAC;AAED,SAAS,kBAAkB,CAAC,OAAoB,EAAE,SAAsB;IACvE,IAAI,SAAS,CAAC,cAAc,KAAK,OAAO,CAAC,cAAc,EAAE,CAAC;QACzD,OAAO,SAAS,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;IAChF,CAAC;IACD,OAAO,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;AAC5E,CAAC;AASD,SAAS,WAAW,CAAC,EAAE,GAAG,EAAE,IAAI,EAAc;IAC7C,OAAO;QACN,GAAG;QACH,IAAI,EAAE;YACL,GAAG,IAAI;YACP,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;YACtC,SAAS,EAAE,IAAI;SACf;KACD,CAAC;AACH,CAAC"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.materialize = materialize;
|
|
4
4
|
exports.totalDiscarded = totalDiscarded;
|
|
5
5
|
const constants_1 = require("@n8n/constants");
|
|
6
|
+
const coalesce_group_1 = require("./coalesce-group");
|
|
6
7
|
const misfire_1 = require("./misfire");
|
|
7
8
|
const options_1 = require("./options");
|
|
8
9
|
const plan_1 = require("./plan");
|
|
@@ -22,7 +23,8 @@ async function materialize(runInTransaction, options = options_1.DEFAULT_MATERIA
|
|
|
22
23
|
retiredOccurrences: 0,
|
|
23
24
|
};
|
|
24
25
|
}
|
|
25
|
-
const { occurrencesPlanned, numberOfJobsDeferred } = planOrDeferJobs(claimed, options, hooks.onPlanError);
|
|
26
|
+
const { occurrencesPlanned: jobsPlanned, numberOfJobsDeferred } = planOrDeferJobs(claimed, options, hooks.onPlanError);
|
|
27
|
+
const occurrencesPlanned = (0, coalesce_group_1.applyCoalesceOwnerPolicy)(jobsPlanned);
|
|
26
28
|
const rows = toNewOccurrences(occurrencesPlanned, claimed.now);
|
|
27
29
|
const { recorded, created } = await tx.recordOccurrences(rows);
|
|
28
30
|
signal?.throwIfAborted();
|
|
@@ -65,7 +67,7 @@ function toNewOccurrences(planned, now) {
|
|
|
65
67
|
}));
|
|
66
68
|
}
|
|
67
69
|
function toSuperseded(planned) {
|
|
68
|
-
return planned.flatMap(({ job, plan }) => plan.
|
|
70
|
+
return planned.flatMap(({ job, plan }) => plan.retireBefore === null ? [] : [{ jobId: job.id, before: plan.retireBefore }]);
|
|
69
71
|
}
|
|
70
72
|
function planOrDeferJobs(dueJobs, options, onPlanError) {
|
|
71
73
|
const plans = dueJobs.jobs.map((job) => planOrDeferJob(job, dueJobs.now, options, onPlanError));
|
|
@@ -95,6 +97,7 @@ function planOrDeferJob(job, now, options, onPlanError) {
|
|
|
95
97
|
occurrences: [],
|
|
96
98
|
skippedOccurrences: 0,
|
|
97
99
|
catchUpAt: null,
|
|
100
|
+
retireBefore: null,
|
|
98
101
|
nextRunAt: retryAt,
|
|
99
102
|
lastFiredAt: job.lastFiredAt,
|
|
100
103
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"materialize.js","sourceRoot":"","sources":["../../../src/core/materializer/materialize.ts"],"names":[],"mappings":";;;;AAAA,8CAAsC;AAGtC,uCAA6D;AAC7D,uCAAmF;AACnF,iCAAyC;AA2FlC,KAAK,sBACX,gBAAkC,EAClC,OAAO,GAAwB,sCAA4B,EAC3D,KAAK,GAAsB,EAAE,EAC7B,MAAoB;IAEpB,MAAM,EAAE,cAAc,EAAE,CAAC;IACzB,OAAO,MAAM,gBAAgB,CAAsB,KAAK,EAAE,EAAE,EAAE,EAAE;QAC/D,MAAM,WAAW,GAAG,OAAO,CAAC,gBAAgB,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;QAC3E,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QACtE,MAAM,EAAE,cAAc,EAAE,CAAC;QACzB,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC3B,OAAO;gBACN,WAAW,EAAE,CAAC;gBACd,WAAW,EAAE,CAAC;gBACd,OAAO,EAAE,EAAE;gBACX,YAAY,EAAE,CAAC;gBACf,QAAQ,EAAE,EAAE;gBACZ,kBAAkB,EAAE,CAAC;aACrB,CAAC;QACH,CAAC;QACD,MAAM,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,GAAG,eAAe,
|
|
1
|
+
{"version":3,"file":"materialize.js","sourceRoot":"","sources":["../../../src/core/materializer/materialize.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,8 @@ function applyMisfirePolicy(due, now, job, truncated) {
|
|
|
12
12
|
return { occurrences: due, catchUpAt: null };
|
|
13
13
|
}
|
|
14
14
|
switch (job.misfirePolicy) {
|
|
15
|
-
case constants_1.ScheduledJobMisfirePolicy.Coalesce:
|
|
15
|
+
case constants_1.ScheduledJobMisfirePolicy.Coalesce:
|
|
16
|
+
case constants_1.ScheduledJobMisfirePolicy.CoalesceOwner: {
|
|
16
17
|
if (truncated && ahead.length === 0)
|
|
17
18
|
return { occurrences: [], catchUpAt: null };
|
|
18
19
|
const catchUpAt = behind[behind.length - 1];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"misfire.js","sourceRoot":"","sources":["../../../src/core/materializer/misfire.ts"],"names":[],"mappings":";;;;AAAA,8CAAiE;AAEjE,sCAAmD;AA0BnD,4BACC,GAAW,EACX,GAAS,EACT,GAAiB,EACjB,SAAkB;IAElB,MAAM,aAAa,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC,mBAAmB,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;IAE5F,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;IACjF,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACvC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,aAAa,EAAE,CAAC;QAChE,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;IAC9C,CAAC;IAED,QAAQ,GAAG,CAAC,aAAa,EAAE,CAAC;QAC3B,KAAK,qCAAyB,CAAC,QAAQ,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"misfire.js","sourceRoot":"","sources":["../../../src/core/materializer/misfire.ts"],"names":[],"mappings":";;;;AAAA,8CAAiE;AAEjE,sCAAmD;AA0BnD,4BACC,GAAW,EACX,GAAS,EACT,GAAiB,EACjB,SAAkB;IAElB,MAAM,aAAa,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC,mBAAmB,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;IAE5F,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;IACjF,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACvC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,aAAa,EAAE,CAAC;QAChE,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;IAC9C,CAAC;IAED,QAAQ,GAAG,CAAC,aAAa,EAAE,CAAC;QAC3B,KAAK,qCAAyB,CAAC,QAAQ,CAAC;QACxC,KAAK,qCAAyB,CAAC,aAAa,EAAE,CAAC;YAC9C,IAAI,SAAS,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;YACjF,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAC5C,OAAO,EAAE,WAAW,EAAE,CAAC,SAAS,EAAE,GAAG,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC;QAC1D,CAAC;QACD,KAAK,qCAAyB,CAAC,IAAI;YAClC,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;QAChD,SAAS,CAAC;YAGT,MAAM,UAAU,GAAU,GAAG,CAAC,aAAa,CAAC;YAC5C,MAAM,IAAI,+BAAsB,CAC/B,iBAAiB,GAAG,CAAC,EAAE,gCAAgC,MAAM,CAAC,UAAU,CAAC,GAAG,CAC5E,CAAC;QACH,CAAC;IACF,CAAC;AACF,CAAC;AAGD,uBAA8B,OAAqB;IAClD,MAAM,OAAO,GAAG,OAAO;SACrB,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,GAAG,CAAC,CAAC;SACjD,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE;QACjC,MAAM,GAAG,GAAG,GAAG,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;QACnD,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE;YACtB,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,MAAM,EAAE,GAAG,CAAC,aAAa;YACzB,SAAS,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,SAAS,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,kBAAkB;SACtE,CAAC,CAAC;IACJ,CAAC,EAAE,IAAI,GAAG,EAAwB,CAAC,CAAC;IACrC,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;AAC9B,CAAC"}
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.planOccurrences = planOccurrences;
|
|
4
4
|
const constants_1 = require("@n8n/constants");
|
|
5
|
+
const misfire_1 = require("./misfire");
|
|
5
6
|
const next_run_1 = require("../recurrence/next-run");
|
|
6
7
|
const resolve_1 = require("../recurrence/resolve");
|
|
7
|
-
const misfire_1 = require("./misfire");
|
|
8
8
|
function planOccurrences(job, now, options) {
|
|
9
9
|
const schedule = (0, resolve_1.resolveSchedule)(job, options.defaultTimezone);
|
|
10
10
|
const windowEnd = now.getTime() + options.windowSeconds * constants_1.Time.seconds.toMilliseconds;
|
|
@@ -13,6 +13,7 @@ function planOccurrences(job, now, options) {
|
|
|
13
13
|
occurrences: [],
|
|
14
14
|
skippedOccurrences: 0,
|
|
15
15
|
catchUpAt: null,
|
|
16
|
+
retireBefore: null,
|
|
16
17
|
nextRunAt: null,
|
|
17
18
|
lastFiredAt: job.lastFiredAt,
|
|
18
19
|
};
|
|
@@ -30,6 +31,7 @@ function planOccurrences(job, now, options) {
|
|
|
30
31
|
occurrences,
|
|
31
32
|
skippedOccurrences: due.length - occurrences.length,
|
|
32
33
|
catchUpAt,
|
|
34
|
+
retireBefore: catchUpAt,
|
|
33
35
|
nextRunAt: fire.done ? null : fire.value,
|
|
34
36
|
lastFiredAt: due.at(-1) ?? job.lastFiredAt,
|
|
35
37
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../src/core/materializer/plan.ts"],"names":[],"mappings":";;;AAAA,8CAAsC;AAEtC,qDAAyD;AACzD,mDAAwD;
|
|
1
|
+
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../src/core/materializer/plan.ts"],"names":[],"mappings":";;;AAAA,8CAAsC;AAEtC,uCAA+C;AAC/C,qDAAyD;AACzD,mDAAwD;AA8CxD,yBACC,GAAiB,EACjB,GAAS,EACT,OAA8E;IAI9E,MAAM,QAAQ,GAAG,IAAA,yBAAe,EAAC,GAAG,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAC/D,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,aAAa,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;IAEtF,IAAI,GAAG,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;QAC5B,OAAO;YACN,WAAW,EAAE,EAAE;YACf,kBAAkB,EAAE,CAAC;YACrB,SAAS,EAAE,IAAI;YACf,YAAY,EAAE,IAAI;YAClB,SAAS,EAAE,IAAI;YACf,WAAW,EAAE,GAAG,CAAC,WAAW;SAC5B,CAAC;IACH,CAAC;IAED,MAAM,GAAG,GAAW,EAAE,CAAC;IACvB,MAAM,KAAK,GAAG,IAAA,0BAAe,EAAC,QAAQ,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;IACvD,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IACxB,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,SAAS,IAAI,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QAC1F,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC;IAGD,MAAM,SAAS,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,SAAS,CAAC;IAElE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,IAAA,4BAAkB,EAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;IAEhF,OAAO;QACN,WAAW;QACX,kBAAkB,EAAE,GAAG,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM;QACnD,SAAS;QACT,YAAY,EAAE,SAAS;QACvB,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK;QAGxC,WAAW,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,WAAW;KAC1C,CAAC;AACH,CAAC"}
|
|
@@ -4,6 +4,7 @@ export interface SchedulerMetrics {
|
|
|
4
4
|
recordFireOutcome(taskType: string, result: 'success' | 'failure'): void;
|
|
5
5
|
recordRetry(taskType: string): void;
|
|
6
6
|
observeDispatchLagSeconds(taskType: string, seconds: number): void;
|
|
7
|
+
recordLeaseLost(taskType: string): void;
|
|
7
8
|
recordMaterialized(occurrences: number, deferredJobs: number): void;
|
|
8
9
|
recordMisfired(discarded: MisfireCount[]): void;
|
|
9
10
|
recordRetired(retired: number): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../src/observability/metrics.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../src/observability/metrics.ts"],"names":[],"mappings":";;;AA0Ca,QAAA,WAAW,GAAqB;IAC5C,cAAc,KAAI,CAAC;IACnB,iBAAiB,KAAI,CAAC;IACtB,WAAW,KAAI,CAAC;IAChB,yBAAyB,KAAI,CAAC;IAC9B,eAAe,KAAI,CAAC;IACpB,kBAAkB,KAAI,CAAC;IACvB,cAAc,KAAI,CAAC;IACnB,aAAa,KAAI,CAAC;IAClB,YAAY,KAAI,CAAC;IACjB,kBAAkB,KAAI,CAAC;IACvB,YAAY,KAAI,CAAC;CACjB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@n8n/scheduler",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.5.1",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"module": "src/index.ts",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -18,9 +18,9 @@
|
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"cron-parser": "5.6.1",
|
|
20
20
|
"luxon": "3.7.2",
|
|
21
|
-
"@n8n/
|
|
22
|
-
"
|
|
23
|
-
"n8n
|
|
21
|
+
"@n8n/utils": "1.44.0",
|
|
22
|
+
"n8n-workflow": "2.36.1",
|
|
23
|
+
"@n8n/constants": "0.35.0"
|
|
24
24
|
},
|
|
25
25
|
"devDependencies": {
|
|
26
26
|
"@stryker-mutator/core": "9.6.1",
|
|
@@ -31,8 +31,8 @@
|
|
|
31
31
|
"typescript": "7.0.2",
|
|
32
32
|
"vitest": "^4.1.9",
|
|
33
33
|
"vitest-mock-extended": "^3.1.0",
|
|
34
|
-
"@n8n/
|
|
35
|
-
"@n8n/
|
|
34
|
+
"@n8n/typescript-config": "1.10.0",
|
|
35
|
+
"@n8n/vitest-config": "1.21.0"
|
|
36
36
|
},
|
|
37
37
|
"license": "SEE LICENSE IN LICENSE.md",
|
|
38
38
|
"homepage": "https://n8n.io",
|