@n8n/scheduler 1.7.0 → 1.8.0
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 +168 -31
- package/dist/build.tsbuildinfo +1 -1
- package/dist/core/errors.d.ts +31 -0
- package/dist/core/errors.js +60 -1
- package/dist/core/errors.js.map +1 -1
- package/dist/core/factory.d.ts +6 -0
- package/dist/core/factory.js +89 -0
- package/dist/core/factory.js.map +1 -1
- package/dist/core/index.d.ts +7 -3
- package/dist/core/index.js +15 -1
- package/dist/core/index.js.map +1 -1
- package/dist/core/lifecycle/options.d.ts +2 -0
- package/dist/core/lifecycle/options.js +2 -0
- package/dist/core/lifecycle/options.js.map +1 -1
- package/dist/core/materializer/coalesce-group.js +1 -3
- package/dist/core/materializer/coalesce-group.js.map +1 -1
- package/dist/core/materializer/index.d.ts +1 -0
- package/dist/core/materializer/index.js +4 -1
- package/dist/core/materializer/index.js.map +1 -1
- package/dist/core/materializer/owner-key.d.ts +17 -0
- package/dist/core/materializer/owner-key.js +17 -0
- package/dist/core/materializer/owner-key.js.map +1 -0
- package/dist/core/provisioning/index.d.ts +1 -1
- package/dist/core/provisioning/provisioner.d.ts +9 -3
- package/dist/core/provisioning/provisioner.js +15 -0
- package/dist/core/provisioning/provisioner.js.map +1 -1
- package/dist/core/reconciliation/index.d.ts +4 -0
- package/dist/core/reconciliation/index.js +10 -0
- package/dist/core/reconciliation/index.js.map +1 -0
- package/dist/core/reconciliation/options.d.ts +8 -0
- package/dist/core/reconciliation/options.js +12 -0
- package/dist/core/reconciliation/options.js.map +1 -0
- package/dist/core/reconciliation/owner.d.ts +10 -0
- package/dist/core/reconciliation/owner.js +34 -0
- package/dist/core/reconciliation/owner.js.map +1 -0
- package/dist/core/reconciliation/reconcile.d.ts +38 -0
- package/dist/core/reconciliation/reconcile.js +228 -0
- package/dist/core/reconciliation/reconcile.js.map +1 -0
- package/dist/core/reconciliation/store.d.ts +13 -0
- package/dist/core/reconciliation/store.js +3 -0
- package/dist/core/reconciliation/store.js.map +1 -0
- package/dist/core/recurrence/field.d.ts +2 -2
- package/dist/core/recurrence/field.js.map +1 -1
- package/dist/core/recurrence/kinds/cron.d.ts +2 -2
- package/dist/core/recurrence/kinds/cron.js.map +1 -1
- package/dist/core/recurrence/kinds/interval.d.ts +2 -2
- package/dist/core/recurrence/kinds/interval.js.map +1 -1
- package/dist/core/recurrence/kinds/one-off.d.ts +2 -2
- package/dist/core/recurrence/kinds/one-off.js.map +1 -1
- package/dist/core/recurrence/kinds/recurring-cron.d.ts +2 -2
- package/dist/core/recurrence/kinds/recurring-cron.js.map +1 -1
- package/dist/core/recurrence/resolve.d.ts +4 -2
- package/dist/core/recurrence/resolve.js +15 -0
- package/dist/core/recurrence/resolve.js.map +1 -1
- package/dist/core/scheduler.d.ts +2 -0
- package/dist/core/types/schedule.d.ts +2 -1
- package/dist/observability/attributes.d.ts +5 -0
- package/dist/observability/attributes.js +5 -0
- package/dist/observability/attributes.js.map +1 -1
- 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 +7 -7
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createJobProvisioner = createJobProvisioner;
|
|
4
|
+
const constants_1 = require("@n8n/constants");
|
|
4
5
|
const provision_1 = require("./provision");
|
|
5
6
|
const provisioner_tracing_1 = require("../../observability/provisioner-tracing");
|
|
6
7
|
const tracer_1 = require("../../observability/tracer");
|
|
8
|
+
const errors_1 = require("../errors");
|
|
7
9
|
function createJobProvisioner(deps) {
|
|
8
10
|
const tracing = (0, provisioner_tracing_1.createProvisionerTracing)(deps.tracer ?? tracer_1.noopTracer);
|
|
9
11
|
return {
|
|
10
12
|
async provision(scope, desired) {
|
|
13
|
+
assertProvisionableOwner(deps.owners, scope.owner);
|
|
11
14
|
return await tracing.provision(async () => await (0, provision_1.provision)(deps.provisionTransaction(scope), desired));
|
|
12
15
|
},
|
|
13
16
|
async deprovision(scope) {
|
|
@@ -15,4 +18,16 @@ function createJobProvisioner(deps) {
|
|
|
15
18
|
},
|
|
16
19
|
};
|
|
17
20
|
}
|
|
21
|
+
function assertProvisionableOwner(owners, { ownerType, ownerId, ownerMemberId }) {
|
|
22
|
+
if (!owners.has(ownerType)) {
|
|
23
|
+
throw new errors_1.UnregisteredOwnerTypeError(ownerType);
|
|
24
|
+
}
|
|
25
|
+
if (ownerId === '' || ownerId.length > constants_1.SCHEDULED_JOB_OWNER_ID_MAX_LENGTH) {
|
|
26
|
+
throw new errors_1.InvalidOwnerIdError(ownerId.length, constants_1.SCHEDULED_JOB_OWNER_ID_MAX_LENGTH);
|
|
27
|
+
}
|
|
28
|
+
if (ownerMemberId !== null &&
|
|
29
|
+
(ownerMemberId === '' || ownerMemberId.length > constants_1.SCHEDULED_JOB_OWNER_MEMBER_ID_MAX_LENGTH)) {
|
|
30
|
+
throw new errors_1.InvalidOwnerMemberIdError(ownerMemberId.length, constants_1.SCHEDULED_JOB_OWNER_MEMBER_ID_MAX_LENGTH);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
18
33
|
//# sourceMappingURL=provisioner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisioner.js","sourceRoot":"","sources":["../../../src/core/provisioning/provisioner.ts"],"names":[],"mappings":";;;AAAA,2CAAqD;AAGrD,iFAAmF;AACnF,uDAAqE;
|
|
1
|
+
{"version":3,"file":"provisioner.js","sourceRoot":"","sources":["../../../src/core/provisioning/provisioner.ts"],"names":[],"mappings":";;;AAAA,8CAGwB;AAExB,2CAAqD;AAGrD,iFAAmF;AACnF,uDAAqE;AACrE,sCAImB;AAiDnB,8BACC,IAAwC;IAExC,MAAM,OAAO,GAAG,IAAA,8CAAwB,EAAC,IAAI,CAAC,MAAM,IAAI,mBAAU,CAAC,CAAC;IACpE,OAAO;QACN,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO;YAC7B,wBAAwB,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;YACnD,OAAO,MAAM,OAAO,CAAC,SAAS,CAC7B,KAAK,IAAI,EAAE,CAAC,MAAM,IAAA,qBAAS,EAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CACtE,CAAC;QACH,CAAC;QACD,KAAK,CAAC,WAAW,CAAC,KAAK;YACtB,OAAO,MAAM,OAAO,CAAC,WAAW,CAC/B,KAAK,IAAI,EAAE,CAAC,MAAM,IAAA,uBAAW,EAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CACjE,CAAC;QACH,CAAC;KACD,CAAC;AACH,CAAC;AAUD,SAAS,wBAAwB,CAChC,MAAiC,EACjC,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,EAAqB;IAExD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,mCAA0B,CAAC,SAAS,CAAC,CAAC;IACjD,CAAC;IACD,IAAI,OAAO,KAAK,EAAE,IAAI,OAAO,CAAC,MAAM,GAAG,6CAAiC,EAAE,CAAC;QAC1E,MAAM,IAAI,4BAAmB,CAAC,OAAO,CAAC,MAAM,EAAE,6CAAiC,CAAC,CAAC;IAClF,CAAC;IACD,IACC,aAAa,KAAK,IAAI;QACtB,CAAC,aAAa,KAAK,EAAE,IAAI,aAAa,CAAC,MAAM,GAAG,oDAAwC,CAAC,EACxF,CAAC;QACF,MAAM,IAAI,kCAAyB,CAClC,aAAa,CAAC,MAAM,EACpB,oDAAwC,CACxC,CAAC;IACH,CAAC;AACF,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
export { reconcile, type ReconciliationCursor, type ReconciliationHooks, type ReconciliationSummary, } from './reconcile';
|
|
2
|
+
export { DEFAULT_RECONCILIATION_OPTIONS, type ReconciliationOptions } from './options';
|
|
3
|
+
export { ScheduledJobOwnerRegistry, type ScheduledJobOwnerResolver } from './owner';
|
|
4
|
+
export type { QuarantinedJob, ReconciliationJobStore } from './store';
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ScheduledJobOwnerRegistry = exports.DEFAULT_RECONCILIATION_OPTIONS = exports.reconcile = void 0;
|
|
4
|
+
var reconcile_1 = require("./reconcile");
|
|
5
|
+
Object.defineProperty(exports, "reconcile", { enumerable: true, get: function () { return reconcile_1.reconcile; } });
|
|
6
|
+
var options_1 = require("./options");
|
|
7
|
+
Object.defineProperty(exports, "DEFAULT_RECONCILIATION_OPTIONS", { enumerable: true, get: function () { return options_1.DEFAULT_RECONCILIATION_OPTIONS; } });
|
|
8
|
+
var owner_1 = require("./owner");
|
|
9
|
+
Object.defineProperty(exports, "ScheduledJobOwnerRegistry", { enumerable: true, get: function () { return owner_1.ScheduledJobOwnerRegistry; } });
|
|
10
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/reconciliation/index.ts"],"names":[],"mappings":";;;AAAA,yCAKqB;AAJpB,sGAAA,SAAS,OAAA;AAKV,qCAAuF;AAA9E,yHAAA,8BAA8B,OAAA;AACvC,iCAAoF;AAA3E,kHAAA,yBAAyB,OAAA"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DEFAULT_RECONCILIATION_OPTIONS = void 0;
|
|
4
|
+
const constants_1 = require("@n8n/constants");
|
|
5
|
+
exports.DEFAULT_RECONCILIATION_OPTIONS = {
|
|
6
|
+
settleSeconds: 5 * constants_1.Time.minutes.toSeconds,
|
|
7
|
+
quarantineGraceSeconds: constants_1.Time.days.toSeconds,
|
|
8
|
+
batchSize: 500,
|
|
9
|
+
maxPagesPerPass: 1000,
|
|
10
|
+
defaultTimezone: 'UTC',
|
|
11
|
+
};
|
|
12
|
+
//# sourceMappingURL=options.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../src/core/reconciliation/options.ts"],"names":[],"mappings":";;;AAAA,8CAAsC;AAoBzB,QAAA,8BAA8B,GAA0B;IACpE,aAAa,EAAE,CAAC,GAAG,gBAAI,CAAC,OAAO,CAAC,SAAS;IACzC,sBAAsB,EAAE,gBAAI,CAAC,IAAI,CAAC,SAAS;IAC3C,SAAS,EAAE,GAAG;IACd,eAAe,EAAE,IAAI;IACrB,eAAe,EAAE,KAAK;CACtB,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export interface ScheduledJobOwnerResolver {
|
|
2
|
+
findExisting(ownerIds: string[]): Promise<Set<string>>;
|
|
3
|
+
}
|
|
4
|
+
export declare class ScheduledJobOwnerRegistry {
|
|
5
|
+
private readonly resolvers;
|
|
6
|
+
register(ownerType: string, resolver: ScheduledJobOwnerResolver): void;
|
|
7
|
+
has(ownerType: string): boolean;
|
|
8
|
+
resolverFor(ownerType: string): ScheduledJobOwnerResolver | undefined;
|
|
9
|
+
ownerTypes(): string[];
|
|
10
|
+
}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ScheduledJobOwnerRegistry = void 0;
|
|
4
|
+
const constants_1 = require("@n8n/constants");
|
|
5
|
+
const errors_1 = require("../errors");
|
|
6
|
+
class ScheduledJobOwnerRegistry {
|
|
7
|
+
constructor() {
|
|
8
|
+
this.resolvers = new Map();
|
|
9
|
+
}
|
|
10
|
+
register(ownerType, resolver) {
|
|
11
|
+
if (ownerType === '' || ownerType.length > constants_1.SCHEDULED_JOB_OWNER_TYPE_MAX_LENGTH) {
|
|
12
|
+
throw new errors_1.InvalidOwnerTypeError(ownerType, constants_1.SCHEDULED_JOB_OWNER_TYPE_MAX_LENGTH);
|
|
13
|
+
}
|
|
14
|
+
const existing = this.resolvers.get(ownerType);
|
|
15
|
+
if (existing === resolver) {
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
if (existing !== undefined) {
|
|
19
|
+
throw new errors_1.DuplicateOwnerResolverError(ownerType);
|
|
20
|
+
}
|
|
21
|
+
this.resolvers.set(ownerType, resolver);
|
|
22
|
+
}
|
|
23
|
+
has(ownerType) {
|
|
24
|
+
return this.resolvers.has(ownerType);
|
|
25
|
+
}
|
|
26
|
+
resolverFor(ownerType) {
|
|
27
|
+
return this.resolvers.get(ownerType);
|
|
28
|
+
}
|
|
29
|
+
ownerTypes() {
|
|
30
|
+
return [...this.resolvers.keys()];
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
exports.ScheduledJobOwnerRegistry = ScheduledJobOwnerRegistry;
|
|
34
|
+
//# sourceMappingURL=owner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"owner.js","sourceRoot":"","sources":["../../../src/core/reconciliation/owner.ts"],"names":[],"mappings":";;;AAAA,8CAAqE;AAErE,sCAA+E;AA6B/E;IAAA;QACkB,cAAS,GAAG,IAAI,GAAG,EAAqC,CAAC;IAyC3E,CAAC;IA9BA,QAAQ,CAAC,SAAiB,EAAE,QAAmC;QAC9D,IAAI,SAAS,KAAK,EAAE,IAAI,SAAS,CAAC,MAAM,GAAG,+CAAmC,EAAE,CAAC;YAChF,MAAM,IAAI,8BAAqB,CAAC,SAAS,EAAE,+CAAmC,CAAC,CAAC;QACjF,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC/C,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC3B,OAAO;QACR,CAAC;QACD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC5B,MAAM,IAAI,oCAA2B,CAAC,SAAS,CAAC,CAAC;QAClD,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACzC,CAAC;IAGD,GAAG,CAAC,SAAiB;QACpB,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACtC,CAAC;IAGD,WAAW,CAAC,SAAiB;QAC5B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACtC,CAAC;IAGD,UAAU;QACT,OAAO,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;IACnC,CAAC;CACD"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { type ReconciliationOptions } from './options';
|
|
2
|
+
import type { ScheduledJobOwnerRegistry } from './owner';
|
|
3
|
+
import type { ReconciliationJobStore } from './store';
|
|
4
|
+
export interface ReconciliationCursor {
|
|
5
|
+
ownerType: string;
|
|
6
|
+
after?: string;
|
|
7
|
+
}
|
|
8
|
+
export interface ReconciliationSummary {
|
|
9
|
+
ownersChecked: number;
|
|
10
|
+
quarantined: number;
|
|
11
|
+
deleted: number;
|
|
12
|
+
revived: number;
|
|
13
|
+
skippedOwnerTypes: string[];
|
|
14
|
+
drained: boolean;
|
|
15
|
+
resumeFrom?: ReconciliationCursor;
|
|
16
|
+
}
|
|
17
|
+
export interface ReconciliationHooks {
|
|
18
|
+
onUnclaimedOwnerType?: (ownerType: string) => void;
|
|
19
|
+
onResolverFailed?: (ownerType: string, error: Error) => void;
|
|
20
|
+
onQuarantined?: (context: {
|
|
21
|
+
ownerType: string;
|
|
22
|
+
jobs: number;
|
|
23
|
+
}) => void;
|
|
24
|
+
onDeleted?: (context: {
|
|
25
|
+
ownerType: string;
|
|
26
|
+
jobs: number;
|
|
27
|
+
}) => void;
|
|
28
|
+
onRevived?: (context: {
|
|
29
|
+
ownerType: string;
|
|
30
|
+
ownerIds: string[];
|
|
31
|
+
jobs: number;
|
|
32
|
+
}) => void;
|
|
33
|
+
onReviveClockFailed?: (context: {
|
|
34
|
+
jobId: number;
|
|
35
|
+
error: Error;
|
|
36
|
+
}) => void;
|
|
37
|
+
}
|
|
38
|
+
export declare function reconcile(store: ReconciliationJobStore, owners: ScheduledJobOwnerRegistry, now: () => Promise<Date>, options?: ReconciliationOptions, hooks?: ReconciliationHooks, signal?: AbortSignal, resumeFrom?: ReconciliationCursor): Promise<ReconciliationSummary>;
|
|
@@ -0,0 +1,228 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.reconcile = reconcile;
|
|
4
|
+
const ensure_error_1 = require("@n8n/utils/errors/ensure-error");
|
|
5
|
+
const options_1 = require("./options");
|
|
6
|
+
const next_run_1 = require("../recurrence/next-run");
|
|
7
|
+
const resolve_1 = require("../recurrence/resolve");
|
|
8
|
+
async function reconcile(store, owners, now, options = options_1.DEFAULT_RECONCILIATION_OPTIONS, hooks = {}, signal, resumeFrom) {
|
|
9
|
+
const summary = {
|
|
10
|
+
ownersChecked: 0,
|
|
11
|
+
quarantined: 0,
|
|
12
|
+
deleted: 0,
|
|
13
|
+
revived: 0,
|
|
14
|
+
skippedOwnerTypes: [],
|
|
15
|
+
drained: true,
|
|
16
|
+
};
|
|
17
|
+
const at = await now();
|
|
18
|
+
const clock = {
|
|
19
|
+
now: at,
|
|
20
|
+
settledBefore: secondsBefore(at, options.settleSeconds),
|
|
21
|
+
quarantinedBefore: secondsBefore(at, options.quarantineGraceSeconds),
|
|
22
|
+
};
|
|
23
|
+
let budget = options.maxPagesPerPass;
|
|
24
|
+
const ownerTypes = (await store.findOwnerTypes()).sort();
|
|
25
|
+
for (const ownerType of pendingOwnerTypes(ownerTypes, resumeFrom?.ownerType)) {
|
|
26
|
+
if (signal?.aborted === true || budget <= 0) {
|
|
27
|
+
summary.drained = false;
|
|
28
|
+
summary.resumeFrom ??= { ownerType };
|
|
29
|
+
break;
|
|
30
|
+
}
|
|
31
|
+
const resolver = owners.resolverFor(ownerType);
|
|
32
|
+
if (resolver === undefined) {
|
|
33
|
+
summary.skippedOwnerTypes.push(ownerType);
|
|
34
|
+
summary.drained = false;
|
|
35
|
+
notify(() => hooks.onUnclaimedOwnerType?.(ownerType));
|
|
36
|
+
continue;
|
|
37
|
+
}
|
|
38
|
+
const swept = await sweepOwnerType({
|
|
39
|
+
store,
|
|
40
|
+
ownerType,
|
|
41
|
+
resolver,
|
|
42
|
+
clock,
|
|
43
|
+
options: { ...options, maxPagesPerPass: budget },
|
|
44
|
+
now,
|
|
45
|
+
hooks,
|
|
46
|
+
signal,
|
|
47
|
+
}, ownerType === resumeFrom?.ownerType ? resumeFrom.after : undefined);
|
|
48
|
+
budget -= swept.pages;
|
|
49
|
+
if (swept.outcome === 'stopped') {
|
|
50
|
+
summary.resumeFrom ??= { ownerType, after: swept.after };
|
|
51
|
+
}
|
|
52
|
+
if (swept.outcome === 'failed' && swept.totals.ownersChecked === 0) {
|
|
53
|
+
summary.skippedOwnerTypes.push(ownerType);
|
|
54
|
+
}
|
|
55
|
+
summary.drained &&= swept.outcome === 'drained';
|
|
56
|
+
summary.ownersChecked += swept.totals.ownersChecked;
|
|
57
|
+
summary.quarantined += swept.totals.quarantined;
|
|
58
|
+
summary.deleted += swept.totals.deleted;
|
|
59
|
+
summary.revived += swept.totals.revived;
|
|
60
|
+
}
|
|
61
|
+
return summary;
|
|
62
|
+
}
|
|
63
|
+
function pendingOwnerTypes(ownerTypes, from) {
|
|
64
|
+
if (from === undefined) {
|
|
65
|
+
return ownerTypes;
|
|
66
|
+
}
|
|
67
|
+
const start = ownerTypes.findIndex((ownerType) => ownerType >= from);
|
|
68
|
+
return start === -1 ? ownerTypes : ownerTypes.slice(start);
|
|
69
|
+
}
|
|
70
|
+
async function sweepOwnerType(sweep, startAfter) {
|
|
71
|
+
let totals = noTotals();
|
|
72
|
+
let after = startAfter;
|
|
73
|
+
let pages = 0;
|
|
74
|
+
while (pages < sweep.options.maxPagesPerPass) {
|
|
75
|
+
if (sweep.signal?.aborted === true) {
|
|
76
|
+
return { totals, pages, outcome: 'stopped', after };
|
|
77
|
+
}
|
|
78
|
+
const page = await sweepPage(sweep, after);
|
|
79
|
+
pages += 1;
|
|
80
|
+
totals = addTotals(totals, page.totals);
|
|
81
|
+
if (page.outcome === 'failed') {
|
|
82
|
+
return { totals, pages, outcome: 'failed' };
|
|
83
|
+
}
|
|
84
|
+
if (page.outcome === 'unfinished') {
|
|
85
|
+
return { totals, pages, outcome: 'stopped', after };
|
|
86
|
+
}
|
|
87
|
+
if (page.outcome === 'drained') {
|
|
88
|
+
return { totals, pages, outcome: 'drained' };
|
|
89
|
+
}
|
|
90
|
+
after = page.after;
|
|
91
|
+
}
|
|
92
|
+
return { totals, pages, outcome: 'stopped', after };
|
|
93
|
+
}
|
|
94
|
+
async function sweepPage(sweep, after) {
|
|
95
|
+
const { store, ownerType, clock, options, hooks } = sweep;
|
|
96
|
+
const ownerIds = await store.findOwnerIds(ownerType, clock.settledBefore, options.batchSize, after);
|
|
97
|
+
if (ownerIds.length === 0) {
|
|
98
|
+
return { outcome: 'drained', totals: noTotals() };
|
|
99
|
+
}
|
|
100
|
+
const liveness = await askLiveness(sweep, ownerIds);
|
|
101
|
+
if (liveness === undefined) {
|
|
102
|
+
return { outcome: 'failed', totals: noTotals() };
|
|
103
|
+
}
|
|
104
|
+
let { alive, missing } = liveness;
|
|
105
|
+
const quarantined = await quarantine(store, ownerType, missing, clock, hooks);
|
|
106
|
+
if (quarantined > 0) {
|
|
107
|
+
const recheck = await askLiveness(sweep, missing);
|
|
108
|
+
if (recheck === undefined) {
|
|
109
|
+
return {
|
|
110
|
+
outcome: 'failed',
|
|
111
|
+
totals: { ownersChecked: ownerIds.length, quarantined, deleted: 0, revived: 0 },
|
|
112
|
+
};
|
|
113
|
+
}
|
|
114
|
+
alive = [...alive, ...recheck.alive];
|
|
115
|
+
missing = recheck.missing;
|
|
116
|
+
}
|
|
117
|
+
const deleted = await deleteExpired(store, ownerType, missing, clock.quarantinedBefore, hooks);
|
|
118
|
+
const revival = await revive(store, ownerType, alive, sweep.now, options, hooks, sweep.signal);
|
|
119
|
+
const totals = {
|
|
120
|
+
ownersChecked: ownerIds.length,
|
|
121
|
+
quarantined,
|
|
122
|
+
deleted,
|
|
123
|
+
revived: revival.jobs,
|
|
124
|
+
};
|
|
125
|
+
if (revival.unfinished) {
|
|
126
|
+
return { outcome: 'unfinished', totals };
|
|
127
|
+
}
|
|
128
|
+
if (ownerIds.length < options.batchSize) {
|
|
129
|
+
return { outcome: 'drained', totals };
|
|
130
|
+
}
|
|
131
|
+
return { outcome: 'swept', totals, after: ownerIds[ownerIds.length - 1] };
|
|
132
|
+
}
|
|
133
|
+
async function askLiveness(sweep, ownerIds) {
|
|
134
|
+
let existing;
|
|
135
|
+
try {
|
|
136
|
+
existing = await sweep.resolver.findExisting(ownerIds);
|
|
137
|
+
}
|
|
138
|
+
catch (error) {
|
|
139
|
+
notify(() => sweep.hooks.onResolverFailed?.(sweep.ownerType, (0, ensure_error_1.ensureError)(error)));
|
|
140
|
+
return undefined;
|
|
141
|
+
}
|
|
142
|
+
return {
|
|
143
|
+
alive: ownerIds.filter((ownerId) => existing.has(ownerId)),
|
|
144
|
+
missing: ownerIds.filter((ownerId) => !existing.has(ownerId)),
|
|
145
|
+
};
|
|
146
|
+
}
|
|
147
|
+
function noTotals() {
|
|
148
|
+
return { ownersChecked: 0, quarantined: 0, deleted: 0, revived: 0 };
|
|
149
|
+
}
|
|
150
|
+
function addTotals(first, second) {
|
|
151
|
+
return {
|
|
152
|
+
ownersChecked: first.ownersChecked + second.ownersChecked,
|
|
153
|
+
quarantined: first.quarantined + second.quarantined,
|
|
154
|
+
deleted: first.deleted + second.deleted,
|
|
155
|
+
revived: first.revived + second.revived,
|
|
156
|
+
};
|
|
157
|
+
}
|
|
158
|
+
async function quarantine(store, ownerType, ownerIds, clock, hooks) {
|
|
159
|
+
if (ownerIds.length === 0) {
|
|
160
|
+
return 0;
|
|
161
|
+
}
|
|
162
|
+
const quarantined = await store.quarantineByOwnerIds(ownerType, ownerIds, clock.now, clock.settledBefore);
|
|
163
|
+
if (quarantined > 0) {
|
|
164
|
+
notify(() => hooks.onQuarantined?.({ ownerType, jobs: quarantined }));
|
|
165
|
+
}
|
|
166
|
+
return quarantined;
|
|
167
|
+
}
|
|
168
|
+
async function deleteExpired(store, ownerType, ownerIds, quarantinedBefore, hooks) {
|
|
169
|
+
if (ownerIds.length === 0) {
|
|
170
|
+
return 0;
|
|
171
|
+
}
|
|
172
|
+
const deleted = await store.deleteQuarantinedByOwnerIds(ownerType, ownerIds, quarantinedBefore);
|
|
173
|
+
if (deleted > 0) {
|
|
174
|
+
notify(() => hooks.onDeleted?.({ ownerType, jobs: deleted }));
|
|
175
|
+
}
|
|
176
|
+
return deleted;
|
|
177
|
+
}
|
|
178
|
+
async function revive(store, ownerType, ownerIds, now, options, hooks, signal) {
|
|
179
|
+
if (ownerIds.length === 0) {
|
|
180
|
+
return { jobs: 0, unfinished: false };
|
|
181
|
+
}
|
|
182
|
+
const quarantined = await store.findQuarantinedByOwnerIds(ownerType, ownerIds, options.batchSize);
|
|
183
|
+
if (quarantined.length === 0) {
|
|
184
|
+
return { jobs: 0, unfinished: false };
|
|
185
|
+
}
|
|
186
|
+
const from = await now();
|
|
187
|
+
let revived = 0;
|
|
188
|
+
let lifts = 0;
|
|
189
|
+
const revivedOwnerIds = new Set();
|
|
190
|
+
for (const job of quarantined) {
|
|
191
|
+
if (signal?.aborted === true) {
|
|
192
|
+
break;
|
|
193
|
+
}
|
|
194
|
+
const lifted = await store.liftQuarantine(job.id, job.enabled ? nextRunAtFor(job, from, options.defaultTimezone, hooks) : null);
|
|
195
|
+
revived += lifted;
|
|
196
|
+
lifts += 1;
|
|
197
|
+
if (lifted > 0) {
|
|
198
|
+
revivedOwnerIds.add(job.ownerId);
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
if (revived > 0) {
|
|
202
|
+
notify(() => hooks.onRevived?.({ ownerType, ownerIds: [...revivedOwnerIds], jobs: revived }));
|
|
203
|
+
}
|
|
204
|
+
return {
|
|
205
|
+
jobs: revived,
|
|
206
|
+
unfinished: lifts < quarantined.length || quarantined.length === options.batchSize,
|
|
207
|
+
};
|
|
208
|
+
}
|
|
209
|
+
function nextRunAtFor(job, from, defaultTimezone, hooks) {
|
|
210
|
+
try {
|
|
211
|
+
return (0, next_run_1.computeFirstRunAt)((0, resolve_1.resolveSchedule)(job, defaultTimezone), from);
|
|
212
|
+
}
|
|
213
|
+
catch (error) {
|
|
214
|
+
notify(() => hooks.onReviveClockFailed?.({ jobId: job.id, error: (0, ensure_error_1.ensureError)(error) }));
|
|
215
|
+
return null;
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
function notify(report) {
|
|
219
|
+
try {
|
|
220
|
+
report();
|
|
221
|
+
}
|
|
222
|
+
catch {
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
function secondsBefore(instant, seconds) {
|
|
226
|
+
return new Date(instant.getTime() - seconds * 1000);
|
|
227
|
+
}
|
|
228
|
+
//# sourceMappingURL=reconcile.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reconcile.js","sourceRoot":"","sources":["../../../src/core/reconciliation/reconcile.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { StoredSchedule } from '../types';
|
|
2
|
+
export type QuarantinedJob = StoredSchedule & {
|
|
3
|
+
ownerId: string;
|
|
4
|
+
enabled: boolean;
|
|
5
|
+
};
|
|
6
|
+
export interface ReconciliationJobStore {
|
|
7
|
+
findOwnerTypes(): Promise<string[]>;
|
|
8
|
+
findOwnerIds(ownerType: string, settledBefore: Date, limit: number, after?: string): Promise<string[]>;
|
|
9
|
+
quarantineByOwnerIds(ownerType: string, ownerIds: string[], orphanedAt: Date, settledBefore: Date): Promise<number>;
|
|
10
|
+
deleteQuarantinedByOwnerIds(ownerType: string, ownerIds: string[], quarantinedBefore: Date): Promise<number>;
|
|
11
|
+
findQuarantinedByOwnerIds(ownerType: string, ownerIds: string[], limit: number): Promise<QuarantinedJob[]>;
|
|
12
|
+
liftQuarantine(id: number, nextRunAt: Date | null): Promise<number>;
|
|
13
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../src/core/reconciliation/store.ts"],"names":[],"mappings":""}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare function required<K extends keyof
|
|
1
|
+
import type { StoredSchedule } from '../types';
|
|
2
|
+
export declare function required<K extends keyof StoredSchedule>(job: StoredSchedule, key: K): NonNullable<StoredSchedule[K]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"field.js","sourceRoot":"","sources":["../../../src/core/recurrence/field.ts"],"names":[],"mappings":";;;AAAA,sCAAmD;AAanD,kBACC,
|
|
1
|
+
{"version":3,"file":"field.js","sourceRoot":"","sources":["../../../src/core/recurrence/field.ts"],"names":[],"mappings":";;;AAAA,sCAAmD;AAanD,kBACC,GAAmB,EACnB,GAAM;IAEN,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;IACvB,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC3C,MAAM,IAAI,+BAAsB,CAC/B,iBAAiB,GAAG,CAAC,EAAE,aAAa,GAAG,CAAC,IAAI,iBAAiB,MAAM,CAAC,GAAG,CAAC,GAAG,CAC3E,CAAC;IACH,CAAC;IACD,OAAO,KAAuC,CAAC;AAChD,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { CronExpressionParser } from 'cron-parser';
|
|
2
2
|
import type { CronExpression } from 'n8n-workflow';
|
|
3
|
-
import type { CronSchedule, RecurringCronSchedule,
|
|
3
|
+
import type { CronSchedule, RecurringCronSchedule, StoredSchedule } from '../../types';
|
|
4
4
|
export type CronCursor = ReturnType<typeof CronExpressionParser.parse>;
|
|
5
5
|
export declare function validateCron(schedule: CronSchedule | RecurringCronSchedule): void;
|
|
6
6
|
export declare function resolvedTimezone(schedule: CronSchedule | RecurringCronSchedule): string;
|
|
7
7
|
export declare function parseCron(cronExpression: CronExpression, after: Date, timezone: string): CronCursor;
|
|
8
8
|
export declare function cronNextRun(schedule: CronSchedule | RecurringCronSchedule, after: Date): Date;
|
|
9
9
|
export declare function cronOccurrences(schedule: CronSchedule, first: Date): Generator<Date>;
|
|
10
|
-
export declare function resolveCron(job:
|
|
10
|
+
export declare function resolveCron(job: StoredSchedule, defaultTimezone: string): CronSchedule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron.js","sourceRoot":"","sources":["../../../../src/core/recurrence/kinds/cron.ts"],"names":[],"mappings":";;;;;;;;AAAA,6CAAmD;AACnD,iCAAiC;AAGjC,yCAAoD;AAEpD,oCAAoC;AAOpC,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAC/B,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAU/B,sBAA6B,QAA8C;IAE1E,MAAM,UAAU,GAAY,QAAQ,CAAC,cAAc,CAAC;IACpD,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QACpC,MAAM,IAAI,6BAAoB,CAC7B,GAAG,QAAQ,CAAC,IAAI,yCAAyC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CACrF,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;IACzD,IAAI,UAAU,GAAG,oBAAoB,IAAI,UAAU,GAAG,oBAAoB,EAAE,CAAC;QAC5E,MAAM,IAAI,6BAAoB,CAC7B,6BAA6B,oBAAoB,OAAO,oBAAoB,mCAAmC,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAC1J,CAAC;IACH,CAAC;IAGD,IAAI,QAAQ,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,gBAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5E,MAAM,IAAI,6BAAoB,CAAC,0BAA0B,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC/F,CAAC;IAED,IAAI,CAAC;QACJ,kCAAoB,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,QAAQ,IAAI,KAAK,EAAE,CAAC,CAAC;IAC5E,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,IAAI,6BAAoB,CAC7B,2BAA2B,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,KAAM,KAAe,CAAC,OAAO,EAAE,CACpF,CAAC;IACH,CAAC;AACF,CAAC;AASD,0BAAiC,QAA8C;IAC9E,IAAI,QAAQ,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;QAChC,MAAM,IAAI,6BAAoB,CAC7B,2FAA2F,CAC3F,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC,QAAQ,CAAC;AAC1B,CAAC;AAaD,mBACC,cAA8B,EAC9B,KAAW,EACX,QAAgB;IAEhB,IAAI,CAAC;QACJ,OAAO,kCAAoB,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IACzF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,IAAI,6BAAoB,CAC7B,sCAAsC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,gBAAgB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAM,KAAe,CAAC,OAAO,EAAE,CAC3I,CAAC;IACH,CAAC;AACF,CAAC;AASD,qBAA4B,QAA8C,EAAE,KAAW;IACtF,OAAO,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,KAAK,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;AAC9F,CAAC;AAOD,QAAe,CAAC,iBAAiB,QAAsB,EAAE,KAAW;IACnE,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,KAAK,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;IACrF,MAAM,KAAK,CAAC;IACZ,SAAS,CAAC;QACT,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;IAC9B,CAAC;AACF,CAAC;AASD,qBAA4B,
|
|
1
|
+
{"version":3,"file":"cron.js","sourceRoot":"","sources":["../../../../src/core/recurrence/kinds/cron.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { IntervalSchedule,
|
|
1
|
+
import type { IntervalSchedule, StoredSchedule } from '../../types';
|
|
2
2
|
export declare function validateInterval(schedule: IntervalSchedule): void;
|
|
3
3
|
export declare function intervalNextRun(schedule: IntervalSchedule, after: Date): Date;
|
|
4
4
|
export declare function intervalOccurrences(schedule: IntervalSchedule, first: Date): Generator<Date>;
|
|
5
|
-
export declare function resolveInterval(job:
|
|
5
|
+
export declare function resolveInterval(job: StoredSchedule): IntervalSchedule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interval.js","sourceRoot":"","sources":["../../../../src/core/recurrence/kinds/interval.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAsC;AAEtC,yCAAoD;AAEpD,oCAAoC;AAOpC,0BAAiC,QAA0B;IAC1D,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,QAAQ,CAAC,eAAe,IAAI,CAAC,EAAE,CAAC;QAClF,MAAM,IAAI,6BAAoB,CAC7B,4DAA4D,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CACtG,CAAC;IACH,CAAC;AACF,CAAC;AASD,yBAAgC,QAA0B,EAAE,KAAW;IACtE,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,eAAe,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;AAC3F,CAAC;AAOD,QAAe,CAAC,qBAAqB,QAA0B,EAAE,KAAW;IAC3E,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,MAAM,QAAQ,CAAC;IACf,SAAS,CAAC;QACT,QAAQ,GAAG,eAAe,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC/C,MAAM,QAAQ,CAAC;IAChB,CAAC;AACF,CAAC;AAQD,yBAAgC,
|
|
1
|
+
{"version":3,"file":"interval.js","sourceRoot":"","sources":["../../../../src/core/recurrence/kinds/interval.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAsC;AAEtC,yCAAoD;AAEpD,oCAAoC;AAOpC,0BAAiC,QAA0B;IAC1D,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,QAAQ,CAAC,eAAe,IAAI,CAAC,EAAE,CAAC;QAClF,MAAM,IAAI,6BAAoB,CAC7B,4DAA4D,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CACtG,CAAC;IACH,CAAC;AACF,CAAC;AASD,yBAAgC,QAA0B,EAAE,KAAW;IACtE,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,eAAe,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;AAC3F,CAAC;AAOD,QAAe,CAAC,qBAAqB,QAA0B,EAAE,KAAW;IAC3E,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,MAAM,QAAQ,CAAC;IACf,SAAS,CAAC;QACT,QAAQ,GAAG,eAAe,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC/C,MAAM,QAAQ,CAAC;IAChB,CAAC;AACF,CAAC;AAQD,yBAAgC,GAAmB;IAClD,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,eAAe,EAAE,IAAA,gBAAQ,EAAC,GAAG,EAAE,iBAAiB,CAAC,EAAE,CAAC;AAChF,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { OneOffSchedule,
|
|
1
|
+
import type { OneOffSchedule, StoredSchedule } from '../../types';
|
|
2
2
|
export declare function validateOneOff(schedule: OneOffSchedule): void;
|
|
3
3
|
export declare function oneOffNextRun(schedule: OneOffSchedule, after: Date): Date | null;
|
|
4
4
|
export declare function oneOffOccurrences(first: Date): Generator<Date>;
|
|
5
|
-
export declare function resolveOneOff(job:
|
|
5
|
+
export declare function resolveOneOff(job: StoredSchedule): OneOffSchedule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"one-off.js","sourceRoot":"","sources":["../../../../src/core/recurrence/kinds/one-off.ts"],"names":[],"mappings":";;;;;;AAAA,yCAAoD;AAEpD,oCAAoC;AAOpC,wBAA+B,QAAwB;IACtD,MAAM,MAAM,GAAY,QAAQ,CAAC,MAAM,CAAC;IACxC,IAAI,CAAC,CAAC,MAAM,YAAY,IAAI,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;QACjE,MAAM,IAAI,6BAAoB,CAAC,qCAAqC,CAAC,CAAC;IACvE,CAAC;AACF,CAAC;AAQD,uBAA8B,QAAwB,EAAE,KAAW;IAClE,OAAO,KAAK,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7E,CAAC;AAOD,QAAe,CAAC,mBAAmB,KAAW;IAC7C,MAAM,KAAK,CAAC;AACb,CAAC;AAQD,uBAA8B,
|
|
1
|
+
{"version":3,"file":"one-off.js","sourceRoot":"","sources":["../../../../src/core/recurrence/kinds/one-off.ts"],"names":[],"mappings":";;;;;;AAAA,yCAAoD;AAEpD,oCAAoC;AAOpC,wBAA+B,QAAwB;IACtD,MAAM,MAAM,GAAY,QAAQ,CAAC,MAAM,CAAC;IACxC,IAAI,CAAC,CAAC,MAAM,YAAY,IAAI,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;QACjE,MAAM,IAAI,6BAAoB,CAAC,qCAAqC,CAAC,CAAC;IACvE,CAAC;AACF,CAAC;AAQD,uBAA8B,QAAwB,EAAE,KAAW;IAClE,OAAO,KAAK,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7E,CAAC;AAOD,QAAe,CAAC,mBAAmB,KAAW;IAC7C,MAAM,KAAK,CAAC;AACb,CAAC;AAQD,uBAA8B,GAAmB;IAChD,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAA,gBAAQ,EAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC;AAC7D,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type { RecurringCronSchedule,
|
|
1
|
+
import type { RecurringCronSchedule, StoredSchedule } from '../../types';
|
|
2
2
|
export declare function validateRecurringCron(schedule: RecurringCronSchedule): void;
|
|
3
3
|
export declare function isOnCadence(previousFire: Date, candidate: Date, schedule: RecurringCronSchedule, timezone: string): boolean;
|
|
4
4
|
export declare function recurringCronNextRun(schedule: RecurringCronSchedule, after: Date): Date;
|
|
5
5
|
export declare function recurringCronFirstRun(schedule: RecurringCronSchedule, from: Date): Date;
|
|
6
6
|
export declare function recurringCronOccurrences(schedule: RecurringCronSchedule, first: Date): Generator<Date>;
|
|
7
|
-
export declare function resolveRecurringCron(job:
|
|
7
|
+
export declare function resolveRecurringCron(job: StoredSchedule, defaultTimezone: string): RecurringCronSchedule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recurring-cron.js","sourceRoot":"","sources":["../../../../src/core/recurrence/kinds/recurring-cron.ts"],"names":[],"mappings":";;;;;;;;AAAA,8CAAuD;AAGvD,yCAAoD;AAEpD,oCAAoC;AACpC,wCAA4C;AAC5C,iCAAiG;AAQjG,MAAM,yBAAyB,GAAG,MAAM,CAAC;AASzC,+BAAsC,QAA+B;IACpE,IAAA,mBAAY,EAAC,QAAQ,CAAC,CAAC;IAEvB,IAAI,CAAC,iCAAqB,CAAC,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QAC9D,MAAM,IAAI,6BAAoB,CAC7B,gDAAgD,iCAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAClI,CAAC;IACH,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,QAAQ,CAAC,cAAc,GAAG,CAAC,EAAE,CAAC;QAC/E,MAAM,IAAI,6BAAoB,CAC7B,uGAAuG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAChJ,CAAC;IACH,CAAC;AACF,CAAC;AAqBD,qBACC,YAAkB,EAClB,SAAe,EACf,QAA+B,EAC/B,QAAgB;IAEhB,MAAM,OAAO,GAAG,IAAA,wBAAc,EAAC,YAAY,EAAE,SAAS,EAAE,QAAQ,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IAC3F,OAAO,OAAO,KAAK,CAAC,IAAI,OAAO,IAAI,QAAQ,CAAC,cAAc,CAAC;AAC5D,CAAC;AAaD,SAAS,kBAAkB,CAC1B,MAAkB,EAClB,QAA+B,EAC/B,YAAkB,EAClB,QAAgB;IAEhB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,yBAAyB,EAAE,OAAO,EAAE,EAAE,CAAC;QACtE,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;QACzC,IAAI,WAAW,CAAC,YAAY,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC9D,OAAO,SAAS,CAAC;QAClB,CAAC;IACF,CAAC;IAED,MAAM,IAAI,6BAAoB,CAC7B,8BAA8B,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,uBAAuB,QAAQ,CAAC,cAAc,IAAI,QAAQ,CAAC,cAAc,mBAAmB,yBAAyB,aAAa,CACvM,CAAC;AACH,CAAC;AAaD,8BAAqC,QAA+B,EAAE,KAAW;IAChF,MAAM,QAAQ,GAAG,IAAA,uBAAgB,EAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,IAAA,gBAAS,EAAC,QAAQ,CAAC,cAAc,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;IACnE,OAAO,kBAAkB,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;AAC9D,CAAC;AAUD,+BAAsC,QAA+B,EAAE,IAAU;IAChF,OAAO,IAAA,kBAAW,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AACpC,CAAC;AASD,QAAe,CAAC,0BACf,QAA+B,EAC/B,KAAW;IAEX,MAAM,QAAQ,GAAG,IAAA,uBAAgB,EAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,IAAA,gBAAS,EAAC,QAAQ,CAAC,cAAc,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;IACnE,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,MAAM,QAAQ,CAAC;IACf,SAAS,CAAC;QACT,QAAQ,GAAG,kBAAkB,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACpE,MAAM,QAAQ,CAAC;IAChB,CAAC;AACF,CAAC;AASD,8BACC,
|
|
1
|
+
{"version":3,"file":"recurring-cron.js","sourceRoot":"","sources":["../../../../src/core/recurrence/kinds/recurring-cron.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,4 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
|
|
1
|
+
import type { ScheduleDefinition } from '@n8n/constants';
|
|
2
|
+
import type { Schedule, StoredSchedule } from '../types';
|
|
3
|
+
export declare function resolveSchedule(job: StoredSchedule, defaultTimezone: string): Schedule;
|
|
4
|
+
export declare function scheduleFromDefinition(definition: ScheduleDefinition, defaultTimezone: string): Schedule;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.resolveSchedule = resolveSchedule;
|
|
4
|
+
exports.scheduleFromDefinition = scheduleFromDefinition;
|
|
4
5
|
const errors_1 = require("../errors");
|
|
5
6
|
const cron_1 = require("./kinds/cron");
|
|
6
7
|
const interval_1 = require("./kinds/interval");
|
|
@@ -22,4 +23,18 @@ function resolveSchedule(job, defaultTimezone) {
|
|
|
22
23
|
}
|
|
23
24
|
}
|
|
24
25
|
}
|
|
26
|
+
function scheduleFromDefinition(definition, defaultTimezone) {
|
|
27
|
+
switch (definition.kind) {
|
|
28
|
+
case 'interval':
|
|
29
|
+
case 'one_off':
|
|
30
|
+
return definition;
|
|
31
|
+
case 'cron':
|
|
32
|
+
case 'recurring_cron':
|
|
33
|
+
return {
|
|
34
|
+
...definition,
|
|
35
|
+
cronExpression: definition.cronExpression,
|
|
36
|
+
timezone: definition.timezone ?? defaultTimezone,
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
}
|
|
25
40
|
//# sourceMappingURL=resolve.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../../src/core/recurrence/resolve.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../../src/core/recurrence/resolve.ts"],"names":[],"mappings":";;;;AAGA,sCAAmD;AAEnD,uCAA2C;AAC3C,+CAAmD;AACnD,6CAAgD;AAChD,2DAA8D;AAe9D,yBAAgC,GAAmB,EAAE,eAAuB;IAC3E,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,MAAM;YACV,OAAO,IAAA,kBAAW,EAAC,GAAG,EAAE,eAAe,CAAC,CAAC;QAC1C,KAAK,gBAAgB;YACpB,OAAO,IAAA,qCAAoB,EAAC,GAAG,EAAE,eAAe,CAAC,CAAC;QACnD,KAAK,UAAU;YACd,OAAO,IAAA,0BAAe,EAAC,GAAG,CAAC,CAAC;QAC7B,KAAK,SAAS;YACb,OAAO,IAAA,uBAAa,EAAC,GAAG,CAAC,CAAC;QAC3B,SAAS,CAAC;YACT,MAAM,UAAU,GAAU,GAAG,CAAC,IAAI,CAAC;YACnC,MAAM,IAAI,+BAAsB,CAC/B,iBAAiB,GAAG,CAAC,EAAE,sBAAsB,MAAM,CAAC,UAAU,CAAC,GAAG,CAClE,CAAC;QACH,CAAC;IACF,CAAC;AACF,CAAC;AASD,gCACC,UAA8B,EAC9B,eAAuB;IAEvB,QAAQ,UAAU,CAAC,IAAI,EAAE,CAAC;QACzB,KAAK,UAAU,CAAC;QAChB,KAAK,SAAS;YACb,OAAO,UAAU,CAAC;QACnB,KAAK,MAAM,CAAC;QACZ,KAAK,gBAAgB;YACpB,OAAO;gBACN,GAAG,UAAU;gBACb,cAAc,EAAE,UAAU,CAAC,cAAgC;gBAC3D,QAAQ,EAAE,UAAU,CAAC,QAAQ,IAAI,eAAe;aAChD,CAAC;IACJ,CAAC;AACF,CAAC"}
|
package/dist/core/scheduler.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { TaskHandler } from './executor';
|
|
2
2
|
import type { MaterializerSummary } from './materializer';
|
|
3
3
|
import type { ReapResult } from './reaper';
|
|
4
|
+
import type { ReconciliationSummary } from './reconciliation';
|
|
4
5
|
import type { RetentionSummary } from './retention';
|
|
5
6
|
import type { ClaimedTask } from './types';
|
|
6
7
|
export interface Scheduler {
|
|
@@ -13,4 +14,5 @@ export interface SchedulerPasses {
|
|
|
13
14
|
execute(signal?: AbortSignal): Promise<ClaimedTask[]>;
|
|
14
15
|
reap(signal?: AbortSignal): Promise<ReapResult>;
|
|
15
16
|
prune(signal?: AbortSignal): Promise<RetentionSummary>;
|
|
17
|
+
reconcile(signal?: AbortSignal): Promise<ReconciliationSummary>;
|
|
16
18
|
}
|
|
@@ -21,6 +21,7 @@ export interface RecurringCronSchedule {
|
|
|
21
21
|
recurrenceSize: number;
|
|
22
22
|
}
|
|
23
23
|
export type Schedule = CronSchedule | IntervalSchedule | OneOffSchedule | RecurringCronSchedule;
|
|
24
|
+
export type StoredSchedule = Pick<ScheduledJob, 'id' | 'kind' | 'cronExpression' | 'timezone' | 'intervalSeconds' | 'fireAt' | 'recurrenceUnit' | 'recurrenceSize'>;
|
|
24
25
|
export interface ScheduledJob {
|
|
25
26
|
id: number;
|
|
26
27
|
taskType: string;
|
|
@@ -37,5 +38,5 @@ export interface ScheduledJob {
|
|
|
37
38
|
maxAttempts: number;
|
|
38
39
|
misfirePolicy: ScheduledJobMisfirePolicy;
|
|
39
40
|
misfireGraceSeconds: number;
|
|
40
|
-
ownerKey: string
|
|
41
|
+
ownerKey: string;
|
|
41
42
|
}
|