n8n 2.35.2 → 2.35.4
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/dist/build.tsbuildinfo +1 -1
- package/dist/events/maps/relay.event-map.d.ts +10 -0
- package/dist/events/relays/telemetry.event-relay.js +3 -0
- package/dist/events/relays/telemetry.event-relay.js.map +1 -1
- package/dist/modules/insights/database/repositories/insights-by-period.repository.d.ts +16 -4
- package/dist/modules/insights/database/repositories/insights-by-period.repository.js +35 -11
- package/dist/modules/insights/database/repositories/insights-by-period.repository.js.map +1 -1
- package/dist/modules/insights/insights.controller.d.ts +3 -3
- package/dist/modules/insights/insights.controller.js +6 -3
- package/dist/modules/insights/insights.controller.js.map +1 -1
- package/dist/modules/insights/insights.service.d.ts +5 -2
- package/dist/modules/insights/insights.service.js +23 -7
- package/dist/modules/insights/insights.service.js.map +1 -1
- package/dist/modules/instance-ai/instance-ai-settings.service.d.ts +11 -0
- package/dist/modules/instance-ai/instance-ai-settings.service.js +26 -13
- package/dist/modules/instance-ai/instance-ai-settings.service.js.map +1 -1
- package/dist/modules/instance-ai/instance-ai-setup-telemetry.service.d.ts +38 -0
- package/dist/modules/instance-ai/instance-ai-setup-telemetry.service.js +212 -0
- package/dist/modules/instance-ai/instance-ai-setup-telemetry.service.js.map +1 -0
- package/dist/modules/instance-ai/instance-ai-verification.service.d.ts +3 -1
- package/dist/modules/instance-ai/instance-ai-verification.service.js +42 -6
- package/dist/modules/instance-ai/instance-ai-verification.service.js.map +1 -1
- package/dist/modules/instance-ai/instance-ai.module.js +2 -0
- package/dist/modules/instance-ai/instance-ai.module.js.map +1 -1
- package/dist/public-api/v1/handlers/discover/discover.service.js +2 -0
- package/dist/public-api/v1/handlers/discover/discover.service.js.map +1 -1
- package/dist/public-api/v1/handlers/insights/insights.handler.js +1 -0
- package/dist/public-api/v1/handlers/insights/insights.handler.js.map +1 -1
- package/dist/public-api/v1/openapi-gen/decorator-routes.d.ts +2 -0
- package/dist/public-api/v1/openapi-gen/decorator-routes.js +13 -0
- package/dist/public-api/v1/openapi-gen/decorator-routes.js.map +1 -1
- package/dist/services/frontend.service.js +5 -1
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/workflows/publication/workflow-publication-applier.d.ts +2 -2
- package/dist/workflows/publication/workflow-publication-applier.js +11 -8
- package/dist/workflows/publication/workflow-publication-applier.js.map +1 -1
- package/dist/workflows/publication/workflow-publication-outbox-consumer.d.ts +3 -1
- package/dist/workflows/publication/workflow-publication-outbox-consumer.js +60 -8
- package/dist/workflows/publication/workflow-publication-outbox-consumer.js.map +1 -1
- package/dist/workflows/triggers/trigger-activation-retry.d.ts +1 -1
- package/dist/workflows/triggers/trigger-activation-retry.js +4 -3
- package/dist/workflows/triggers/trigger-activation-retry.js.map +1 -1
- package/dist/workflows/triggers/workflow-trigger-activator.d.ts +6 -2
- package/dist/workflows/triggers/workflow-trigger-activator.js +63 -26
- package/dist/workflows/triggers/workflow-trigger-activator.js.map +1 -1
- package/dist/workflows/workflow-sharing.service.d.ts +4 -0
- package/dist/workflows/workflow-sharing.service.js +13 -0
- package/dist/workflows/workflow-sharing.service.js.map +1 -1
- package/dist/workflows/workflow.service.ee.d.ts +1 -1
- package/dist/workflows/workflow.service.ee.js +19 -24
- package/dist/workflows/workflow.service.ee.js.map +1 -1
- package/dist/workflows/workflow.service.js +1 -0
- package/dist/workflows/workflow.service.js.map +1 -1
- package/package.json +33 -33
|
@@ -589,10 +589,11 @@ let FrontendService = class FrontendService {
|
|
|
589
589
|
overwriteCredentialsProperties() {
|
|
590
590
|
const { credentials } = this.loadNodesAndCredentials.types;
|
|
591
591
|
const credentialsOverwrites = this.credentialsOverwrites.getAll();
|
|
592
|
-
const { skipTypes } = this.globalConfig.credentials.overwrite;
|
|
592
|
+
const { showScopes = [], skipTypes } = this.globalConfig.credentials.overwrite;
|
|
593
593
|
for (const credential of credentials) {
|
|
594
594
|
delete credential.__overwrittenProperties;
|
|
595
595
|
delete credential.__skipManagedCreation;
|
|
596
|
+
delete credential.__showManagedOAuthScopes;
|
|
596
597
|
const overwrittenProperties = [];
|
|
597
598
|
this.credentialTypes
|
|
598
599
|
.getParentTypes(credential.name)
|
|
@@ -611,6 +612,9 @@ let FrontendService = class FrontendService {
|
|
|
611
612
|
if (skipTypes.includes(credential.name)) {
|
|
612
613
|
credential.__skipManagedCreation = true;
|
|
613
614
|
}
|
|
615
|
+
if (showScopes.includes(credential.name)) {
|
|
616
|
+
credential.__showManagedOAuthScopes = true;
|
|
617
|
+
}
|
|
614
618
|
const isOAuth2Credential = credential.name === 'oAuth2Api' ||
|
|
615
619
|
this.credentialTypes.getParentTypes(credential.name).includes('oAuth2Api');
|
|
616
620
|
if (isOAuth2Credential && credential.properties) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"frontend.service.js","sourceRoot":"","sources":["../../src/services/frontend.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"frontend.service.js","sourceRoot":"","sources":["../../src/services/frontend.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Logger } from '@n8n/backend-common';
|
|
2
2
|
import { WorkflowHistoryRepository, WorkflowPublicationOutbox, WorkflowPublishedVersionRepository, WorkflowRepository } from '@n8n/db';
|
|
3
3
|
import type { PublicationResult } from '../../workflows/publication/publication-result';
|
|
4
|
-
import { WorkflowTriggerActivator } from '../../workflows/triggers/workflow-trigger-activator';
|
|
4
|
+
import { WorkflowTriggerActivator, type TriggerOperationAbort } from '../../workflows/triggers/workflow-trigger-activator';
|
|
5
5
|
import { WorkflowPublishedDataService } from '../../workflows/workflow-published-data.service';
|
|
6
6
|
export declare class WorkflowPublicationApplier {
|
|
7
7
|
private readonly logger;
|
|
@@ -11,7 +11,7 @@ export declare class WorkflowPublicationApplier {
|
|
|
11
11
|
private readonly workflowTriggerActivator;
|
|
12
12
|
private readonly workflowPublishedDataService;
|
|
13
13
|
constructor(logger: Logger, workflowRepository: WorkflowRepository, workflowHistoryRepository: WorkflowHistoryRepository, workflowPublishedVersionRepository: WorkflowPublishedVersionRepository, workflowTriggerActivator: WorkflowTriggerActivator, workflowPublishedDataService: WorkflowPublishedDataService);
|
|
14
|
-
apply(record: WorkflowPublicationOutbox): Promise<PublicationResult>;
|
|
14
|
+
apply(record: WorkflowPublicationOutbox, abort: TriggerOperationAbort): Promise<PublicationResult>;
|
|
15
15
|
private publish;
|
|
16
16
|
private unpublish;
|
|
17
17
|
private classifyActivationOutcome;
|
|
@@ -33,18 +33,18 @@ let WorkflowPublicationApplier = class WorkflowPublicationApplier {
|
|
|
33
33
|
this.workflowPublishedDataService = workflowPublishedDataService;
|
|
34
34
|
this.logger = this.logger.scoped('workflow-publication');
|
|
35
35
|
}
|
|
36
|
-
async apply(record) {
|
|
36
|
+
async apply(record, abort) {
|
|
37
37
|
const { workflow, oldVersion, newVersion } = await this.resolveVersions(record);
|
|
38
38
|
if (!workflow)
|
|
39
39
|
return { type: 'skipped', reason: 'workflow-not-found' };
|
|
40
40
|
if (workflow.activeVersionId === null) {
|
|
41
|
-
return await this.unpublish(workflow, oldVersion, record);
|
|
41
|
+
return await this.unpublish(workflow, oldVersion, record, abort);
|
|
42
42
|
}
|
|
43
43
|
if (!newVersion)
|
|
44
44
|
return { type: 'version-missing' };
|
|
45
|
-
return await this.publish(workflow, oldVersion, newVersion, record);
|
|
45
|
+
return await this.publish(workflow, oldVersion, newVersion, record, abort);
|
|
46
46
|
}
|
|
47
|
-
async publish(workflow, oldVersion, newVersion, record) {
|
|
47
|
+
async publish(workflow, oldVersion, newVersion, record, abort) {
|
|
48
48
|
const oldTriggerNodes = this.workflowTriggerActivator.getEnabledTriggerNodes(oldVersion);
|
|
49
49
|
const desiredTriggerNodes = this.workflowTriggerActivator.getEnabledTriggerNodes(newVersion);
|
|
50
50
|
const triggerKinds = this.workflowTriggerActivator.getTriggerKinds(desiredTriggerNodes);
|
|
@@ -70,14 +70,16 @@ let WorkflowPublicationApplier = class WorkflowPublicationApplier {
|
|
|
70
70
|
}),
|
|
71
71
|
};
|
|
72
72
|
}
|
|
73
|
+
abort.signal.throwIfAborted();
|
|
73
74
|
if (toRemove.size > 0 && oldVersion) {
|
|
74
|
-
await this.workflowTriggerActivator.deactivate(workflow, oldVersion, toRemove);
|
|
75
|
+
await this.workflowTriggerActivator.deactivate(workflow, oldVersion, toRemove, abort);
|
|
75
76
|
}
|
|
76
77
|
await this.advancePublishedVersion(record);
|
|
77
78
|
try {
|
|
79
|
+
abort.signal.throwIfAborted();
|
|
78
80
|
if (toAdd.size > 0) {
|
|
79
81
|
const activationMode = ACTIVATION_MODE_BY_REASON[record.reason ?? db_1.WorkflowPublicationReason.Publish];
|
|
80
|
-
const outcome = await this.workflowTriggerActivator.activate(workflow, newVersion, toAdd, activationMode);
|
|
82
|
+
const outcome = await this.workflowTriggerActivator.activate(workflow, newVersion, toAdd, activationMode, abort);
|
|
81
83
|
return this.classifyActivationOutcome(outcome, desiredTriggerNodes, triggerKinds);
|
|
82
84
|
}
|
|
83
85
|
if (toRemove.size > 0) {
|
|
@@ -95,10 +97,11 @@ let WorkflowPublicationApplier = class WorkflowPublicationApplier {
|
|
|
95
97
|
}),
|
|
96
98
|
};
|
|
97
99
|
}
|
|
98
|
-
async unpublish(workflow, oldVersion, record) {
|
|
100
|
+
async unpublish(workflow, oldVersion, record, abort) {
|
|
99
101
|
const toRemove = new Set(this.workflowTriggerActivator.getEnabledTriggerNodes(oldVersion).map((node) => node.id));
|
|
100
102
|
if (oldVersion && toRemove.size > 0) {
|
|
101
|
-
|
|
103
|
+
abort.signal.throwIfAborted();
|
|
104
|
+
await this.workflowTriggerActivator.deactivate(workflow, oldVersion, toRemove, abort);
|
|
102
105
|
}
|
|
103
106
|
await this.workflowPublishedDataService.invalidateCache(record.workflowId);
|
|
104
107
|
await this.workflowPublishedVersionRepository.removePublishedVersion(record.workflowId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-publication-applier.js","sourceRoot":"","sources":["../../../src/workflows/publication/workflow-publication-applier.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,gCASiB;AACjB,gCAAkC;AAClC,iEAA6D;AAO7D,uEAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"workflow-publication-applier.js","sourceRoot":"","sources":["../../../src/workflows/publication/workflow-publication-applier.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,6 +32,8 @@ export declare class WorkflowPublicationOutboxConsumer {
|
|
|
32
32
|
drainPending(): Promise<number>;
|
|
33
33
|
private runDrain;
|
|
34
34
|
private shouldKeepPolling;
|
|
35
|
-
|
|
35
|
+
private processRecordWithAbort;
|
|
36
|
+
private raceTimeout;
|
|
37
|
+
processRecord(record: WorkflowPublicationOutbox, signal: AbortSignal): Promise<void>;
|
|
36
38
|
private toOutcomeLabels;
|
|
37
39
|
}
|
|
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.WorkflowPublicationOutboxConsumer = void 0;
|
|
13
13
|
const backend_common_1 = require("@n8n/backend-common");
|
|
14
14
|
const config_1 = require("@n8n/config");
|
|
15
|
+
const constants_1 = require("@n8n/constants");
|
|
15
16
|
const db_1 = require("@n8n/db");
|
|
16
17
|
const decorators_1 = require("@n8n/decorators");
|
|
17
18
|
const di_1 = require("@n8n/di");
|
|
@@ -22,6 +23,10 @@ const event_service_1 = require("../../events/event.service");
|
|
|
22
23
|
const publication_status_reporter_1 = require("../../workflows/publication/publication-status-reporter");
|
|
23
24
|
const workflow_publication_lifecycle_lock_1 = require("../../workflows/publication/workflow-publication-lifecycle-lock");
|
|
24
25
|
const workflow_publication_applier_1 = require("../../workflows/publication/workflow-publication-applier");
|
|
26
|
+
const TIMED_OUT = Symbol('timed-out');
|
|
27
|
+
const ABORT_AFTER_LEASE_FRACTION = 0.7;
|
|
28
|
+
const ABANDON_GRACE_MS = 10 * constants_1.Time.seconds.toMilliseconds;
|
|
29
|
+
const ABANDON_GRACE_LEASE_FRACTION = 0.25;
|
|
25
30
|
let WorkflowPublicationOutboxConsumer = class WorkflowPublicationOutboxConsumer {
|
|
26
31
|
constructor(logger, workflowsConfig, errorReporter, outboxRepository, applier, reporter, instanceSettings, lifecycleLock, tracing, eventService) {
|
|
27
32
|
this.logger = logger;
|
|
@@ -116,19 +121,19 @@ let WorkflowPublicationOutboxConsumer = class WorkflowPublicationOutboxConsumer
|
|
|
116
121
|
attributes: { 'n8n.publication.consumer_concurrency': concurrency },
|
|
117
122
|
}, async (span) => {
|
|
118
123
|
let processed = 0;
|
|
119
|
-
let
|
|
124
|
+
let workerFailed = false;
|
|
120
125
|
const runWorker = async () => {
|
|
121
|
-
while (!
|
|
126
|
+
while (!workerFailed && this.shouldKeepPolling()) {
|
|
122
127
|
const record = await this.outboxRepository.claimNextPendingRecord();
|
|
123
128
|
if (!record)
|
|
124
129
|
break;
|
|
125
|
-
await this.
|
|
126
|
-
|
|
130
|
+
if (await this.processRecordWithAbort(record))
|
|
131
|
+
processed++;
|
|
127
132
|
}
|
|
128
133
|
};
|
|
129
134
|
const workerTasks = Array.from({ length: concurrency }, async () => {
|
|
130
135
|
await runWorker().catch((error) => {
|
|
131
|
-
|
|
136
|
+
workerFailed = true;
|
|
132
137
|
throw error;
|
|
133
138
|
});
|
|
134
139
|
});
|
|
@@ -144,7 +149,36 @@ let WorkflowPublicationOutboxConsumer = class WorkflowPublicationOutboxConsumer
|
|
|
144
149
|
shouldKeepPolling() {
|
|
145
150
|
return this.isPolling && !this.isShuttingDown;
|
|
146
151
|
}
|
|
147
|
-
async
|
|
152
|
+
async processRecordWithAbort(record) {
|
|
153
|
+
const leaseMs = this.workflowsConfig.publicationOutboxLeaseSeconds * constants_1.Time.seconds.toMilliseconds;
|
|
154
|
+
const abortAfterMs = leaseMs * ABORT_AFTER_LEASE_FRACTION;
|
|
155
|
+
const abandonGraceMs = Math.min(ABANDON_GRACE_MS, leaseMs * ABANDON_GRACE_LEASE_FRACTION);
|
|
156
|
+
const controller = new AbortController();
|
|
157
|
+
const work = this.processRecord(record, controller.signal);
|
|
158
|
+
if ((await this.raceTimeout(work, abortAfterMs)) !== TIMED_OUT)
|
|
159
|
+
return true;
|
|
160
|
+
controller.abort(new n8n_workflow_1.OperationalError('Workflow publication processing exceeded its deadline'));
|
|
161
|
+
if ((await this.raceTimeout(work, abandonGraceMs)) !== TIMED_OUT)
|
|
162
|
+
return true;
|
|
163
|
+
void work.catch((error) => this.errorReporter.error((0, ensure_error_1.ensureError)(error), { shouldBeLogged: true }));
|
|
164
|
+
this.errorReporter.error(new n8n_workflow_1.OperationalError('Abandoned workflow publication outbox record: processing did not stop after abort', { extra: { outboxId: record.id, workflowId: record.workflowId } }), { shouldBeLogged: true });
|
|
165
|
+
return false;
|
|
166
|
+
}
|
|
167
|
+
async raceTimeout(promise, timeoutMs) {
|
|
168
|
+
let timer;
|
|
169
|
+
try {
|
|
170
|
+
return await Promise.race([
|
|
171
|
+
promise,
|
|
172
|
+
new Promise((resolve) => {
|
|
173
|
+
timer = setTimeout(() => resolve(TIMED_OUT), timeoutMs);
|
|
174
|
+
}),
|
|
175
|
+
]);
|
|
176
|
+
}
|
|
177
|
+
finally {
|
|
178
|
+
clearTimeout(timer);
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
async processRecord(record, signal) {
|
|
148
182
|
await this.tracing.startSpan({
|
|
149
183
|
name: 'Publication outbox record',
|
|
150
184
|
op: 'publication.outbox.process_record',
|
|
@@ -163,6 +197,13 @@ let WorkflowPublicationOutboxConsumer = class WorkflowPublicationOutboxConsumer
|
|
|
163
197
|
});
|
|
164
198
|
return;
|
|
165
199
|
}
|
|
200
|
+
if (signal.aborted) {
|
|
201
|
+
this.logger.debug('Skipped applying publication outbox record: aborted', {
|
|
202
|
+
outboxId: record.id,
|
|
203
|
+
workflowId: record.workflowId,
|
|
204
|
+
});
|
|
205
|
+
return;
|
|
206
|
+
}
|
|
166
207
|
this.logger.debug('Started processing workflow publication outbox record', {
|
|
167
208
|
outboxId: record.id,
|
|
168
209
|
workflowId: record.workflowId,
|
|
@@ -170,14 +211,21 @@ let WorkflowPublicationOutboxConsumer = class WorkflowPublicationOutboxConsumer
|
|
|
170
211
|
});
|
|
171
212
|
const startedAt = Date.now();
|
|
172
213
|
let result;
|
|
214
|
+
const detachedWork = [];
|
|
215
|
+
const abort = {
|
|
216
|
+
signal,
|
|
217
|
+
onDetached: (work) => detachedWork.push(work),
|
|
218
|
+
};
|
|
173
219
|
try {
|
|
174
|
-
result = await this.applier.apply(record);
|
|
220
|
+
result = await this.applier.apply(record, abort);
|
|
175
221
|
}
|
|
176
222
|
catch (error) {
|
|
177
223
|
const cause = (0, ensure_error_1.ensureError)(error);
|
|
178
224
|
result = {
|
|
179
225
|
type: 'failed',
|
|
180
|
-
error:
|
|
226
|
+
error: signal.aborted
|
|
227
|
+
? cause
|
|
228
|
+
: new n8n_workflow_1.UnexpectedError(`Unexpected: ${cause.message}`, { cause }),
|
|
181
229
|
};
|
|
182
230
|
}
|
|
183
231
|
let reporterFailed = false;
|
|
@@ -198,6 +246,10 @@ let WorkflowPublicationOutboxConsumer = class WorkflowPublicationOutboxConsumer
|
|
|
198
246
|
result: result.type,
|
|
199
247
|
});
|
|
200
248
|
span.setAttribute('n8n.publication.result', result.type);
|
|
249
|
+
if (detachedWork.length > 0) {
|
|
250
|
+
this.logger.warn('Keeping workflow publication lock held until abandoned trigger operations settle', { outboxId: record.id, workflowId: record.workflowId });
|
|
251
|
+
await Promise.allSettled(detachedWork);
|
|
252
|
+
}
|
|
201
253
|
});
|
|
202
254
|
span.setStatus({ code: 1 });
|
|
203
255
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-publication-outbox-consumer.js","sourceRoot":"","sources":["../../../src/workflows/publication/workflow-publication-outbox-consumer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,wCAA8C;AAC9C,gCAAyF;AACzF,gDAA8E;AAC9E,gCAAkC;AAClC,uCAAgF;AAChF,iEAA6D;AAC7D,+
|
|
1
|
+
{"version":3,"file":"workflow-publication-outbox-consumer.js","sourceRoot":"","sources":["../../../src/workflows/publication/workflow-publication-outbox-consumer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,wCAA8C;AAC9C,8CAAsC;AACtC,gCAAyF;AACzF,gDAA8E;AAC9E,gCAAkC;AAClC,uCAAgF;AAChF,iEAA6D;AAC7D,+CAAiE;AAEjE,0DAAsD;AAMtD,qGAAgG;AAChG,qHAA+G;AAC/G,uGAAkG;AAOlG,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;AAOtC,MAAM,0BAA0B,GAAG,GAAG,CAAC;AAOvC,MAAM,gBAAgB,GAAG,EAAE,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;AAC1D,MAAM,4BAA4B,GAAG,IAAI,CAAC;AAYnC,IAAM,iCAAiC,GAAvC,MAAM,iCAAiC;IAS7C,YACkB,MAAc,EACd,eAAgC,EAChC,aAA4B,EAC5B,gBAAqD,EACrD,OAAmC,EACnC,QAAmC,EACnC,gBAAkC,EAClC,aAA+C,EAC/C,OAAgB,EAChB,YAA0B;QAT1B,WAAM,GAAN,MAAM,CAAQ;QACd,oBAAe,GAAf,eAAe,CAAiB;QAChC,kBAAa,GAAb,aAAa,CAAe;QAC5B,qBAAgB,GAAhB,gBAAgB,CAAqC;QACrD,YAAO,GAAP,OAAO,CAA4B;QACnC,aAAQ,GAAR,QAAQ,CAA2B;QACnC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,kBAAa,GAAb,aAAa,CAAkC;QAC/C,YAAO,GAAP,OAAO,CAAS;QAChB,iBAAY,GAAZ,YAAY,CAAc;QAhBpC,cAAS,GAAG,KAAK,CAAC;QAElB,mBAAc,GAAG,KAAK,CAAC;QAEvB,gBAAW,GAA2B,IAAI,CAAC;QAclD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,IAAI;QACT,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ;YAAE,OAAO;QAE5C,IAAI,CAAC,YAAY,EAAE,CAAC;QAEpB,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;IAC3B,CAAC;IAED,YAAY;QACX,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,6BAA6B,IAAI,IAAI,CAAC,cAAc;YAAE,OAAO;QACvF,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO;QAE3B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC7C,CAAC;IAED,WAAW;QACV,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QAEvB,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC/B,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;YAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC7C,CAAC;IACF,CAAC;IAGK,AAAN,KAAK,CAAC,QAAQ;QACb,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,WAAW,EAAE,CAAC;QAEnB,MAAM,IAAI,CAAC,WAAW,CAAC;IACxB,CAAC;IAUK,AAAN,KAAK,CAAC,MAAM;QACX,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,6BAA6B;YAAE,OAAO;QAIhE,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ;YAAE,OAAO;QAE5C,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;IAC3B,CAAC;IAKO,iBAAiB;QACxB,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC/B,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;YAAE,OAAO;QAEtC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;YACxC,IAAI,CAAC;gBACJ,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;YACxB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,CAAC;YAED,IAAI,IAAI,CAAC,iBAAiB,EAAE;gBAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACxD,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,+BAA+B,CAAC,CAAC;IAC1D,CAAC;IAEO,KAAK,CAAC,SAAS;QACtB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAG5C,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;YACnB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,SAAS,oDAAoD,CAAC,CAAC;QAC/F,CAAC;IACF,CAAC;IAWD,KAAK,CAAC,YAAY;QACjB,IAAI,IAAI,CAAC,WAAW;YAAE,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC;QAEpD,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC9B,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC;YACJ,OAAO,MAAM,KAAK,CAAC;QACpB,CAAC;gBAAS,CAAC;YACV,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACzB,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,QAAQ;QACrB,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,CAAC,8BAA8B,CAAC;QACxE,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAClC;YACC,IAAI,EAAE,0BAA0B;YAChC,EAAE,EAAE,0BAA0B;YAC9B,UAAU,EAAE,EAAE,sCAAsC,EAAE,WAAW,EAAE;SACnE,EACD,KAAK,EAAE,IAAI,EAAE,EAAE;YACd,IAAI,SAAS,GAAG,CAAC,CAAC;YAGlB,IAAI,YAAY,GAAG,KAAK,CAAC;YACzB,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE;gBAC5B,OAAO,CAAC,YAAY,IAAI,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC;oBAClD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,EAAE,CAAC;oBACpE,IAAI,CAAC,MAAM;wBAAE,MAAM;oBAEnB,IAAI,MAAM,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC;wBAAE,SAAS,EAAE,CAAC;gBAC5D,CAAC;YACF,CAAC,CAAC;YAEF,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,KAAK,IAAI,EAAE;gBAClE,MAAM,SAAS,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;oBACjC,YAAY,GAAG,IAAI,CAAC;oBACpB,MAAM,KAAK,CAAC;gBACb,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YAEtD,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC;YAC7D,IAAI,OAAO,EAAE,MAAM,KAAK,UAAU;gBAAE,MAAM,OAAO,CAAC,MAAM,CAAC;YAEzD,IAAI,CAAC,YAAY,CAAC,mCAAmC,EAAE,SAAS,CAAC,CAAC;YAClE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,GAAe,EAAE,CAAC,CAAC;YACxC,OAAO,SAAS,CAAC;QAClB,CAAC,CACD,CAAC;IACH,CAAC;IAEO,iBAAiB;QACxB,OAAO,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;IAC/C,CAAC;IAQO,KAAK,CAAC,sBAAsB,CAAC,MAAiC;QACrE,MAAM,OAAO,GACZ,IAAI,CAAC,eAAe,CAAC,6BAA6B,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;QAClF,MAAM,YAAY,GAAG,OAAO,GAAG,0BAA0B,CAAC;QAC1D,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,gBAAgB,EAAE,OAAO,GAAG,4BAA4B,CAAC,CAAC;QAE1F,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QACzC,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;QAE3D,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QAE5E,UAAU,CAAC,KAAK,CAAC,IAAI,+BAAgB,CAAC,uDAAuD,CAAC,CAAC,CAAC;QAEhG,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QAG9E,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CACzB,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAA,0BAAW,EAAC,KAAK,CAAC,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CACtE,CAAC;QACF,IAAI,CAAC,aAAa,CAAC,KAAK,CACvB,IAAI,+BAAgB,CACnB,mFAAmF,EACnF,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,EAAE,CACjE,EACD,EAAE,cAAc,EAAE,IAAI,EAAE,CACxB,CAAC;QACF,OAAO,KAAK,CAAC;IACd,CAAC;IAGO,KAAK,CAAC,WAAW,CACxB,OAAmB,EACnB,SAAiB;QAEjB,IAAI,KAAiC,CAAC;QACtC,IAAI,CAAC;YACJ,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC;gBACzB,OAAO;gBACP,IAAI,OAAO,CAAmB,CAAC,OAAO,EAAE,EAAE;oBACzC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,CAAC;gBACzD,CAAC,CAAC;aACF,CAAC,CAAC;QACJ,CAAC;gBAAS,CAAC;YACV,YAAY,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC;IACF,CAAC;IAeD,KAAK,CAAC,aAAa,CAAC,MAAiC,EAAE,MAAmB;QACzE,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAC3B;YACC,IAAI,EAAE,2BAA2B;YACjC,EAAE,EAAE,mCAAmC;YACvC,UAAU,EAAE;gBACX,GAAG,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC;gBACjE,2BAA2B,EAAE,MAAM,CAAC,EAAE;gBACtC,sCAAsC,EAAE,MAAM,CAAC,kBAAkB;aACjE;SACD,EACD,KAAK,EAAE,IAAI,EAAE,EAAE;YACd,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,IAAI,EAAE;gBAInE,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC;oBACrC,MAAM,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBACvD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+DAA+D,EAAE;wBAClF,QAAQ,EAAE,MAAM,CAAC,EAAE;wBACnB,UAAU,EAAE,MAAM,CAAC,UAAU;qBAC7B,CAAC,CAAC;oBACH,OAAO;gBACR,CAAC;gBAOD,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;oBACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qDAAqD,EAAE;wBACxE,QAAQ,EAAE,MAAM,CAAC,EAAE;wBACnB,UAAU,EAAE,MAAM,CAAC,UAAU;qBAC7B,CAAC,CAAC;oBACH,OAAO;gBACR,CAAC;gBAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uDAAuD,EAAE;oBAC1E,QAAQ,EAAE,MAAM,CAAC,EAAE;oBACnB,UAAU,EAAE,MAAM,CAAC,UAAU;oBAC7B,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;iBAC7C,CAAC,CAAC;gBAEH,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBAC7B,IAAI,MAAyB,CAAC;gBAK9B,MAAM,YAAY,GAA4B,EAAE,CAAC;gBACjD,MAAM,KAAK,GAA0B;oBACpC,MAAM;oBACN,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC;iBAC7C,CAAC;gBAEF,IAAI,CAAC;oBACJ,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;gBAClD,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBAChB,MAAM,KAAK,GAAG,IAAA,0BAAW,EAAC,KAAK,CAAC,CAAC;oBACjC,MAAM,GAAG;wBACR,IAAI,EAAE,QAAQ;wBAEd,KAAK,EAAE,MAAM,CAAC,OAAO;4BACpB,CAAC,CAAC,KAAK;4BACP,CAAC,CAAC,IAAI,8BAAe,CAAC,eAAe,KAAK,CAAC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;qBACjE,CAAC;gBACH,CAAC;gBAED,IAAI,cAAc,GAAG,KAAK,CAAC;gBAC3B,IAAI,CAAC;oBACJ,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAC5C,CAAC;gBAAC,OAAO,WAAW,EAAE,CAAC;oBACtB,cAAc,GAAG,IAAI,CAAC;oBACtB,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAED,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,8CAA8C,EAAE;oBACtE,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,cAAc,CAAC;oBAC/C,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;iBAClC,CAAC,CAAC;gBAEH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wDAAwD,EAAE;oBAC3E,QAAQ,EAAE,MAAM,CAAC,EAAE;oBACnB,UAAU,EAAE,MAAM,CAAC,UAAU;oBAC7B,MAAM,EAAE,MAAM,CAAC,IAAI;iBACnB,CAAC,CAAC;gBAEH,IAAI,CAAC,YAAY,CAAC,wBAAwB,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;gBAKzD,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC7B,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,kFAAkF,EAClF,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CACtD,CAAC;oBACF,MAAM,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;gBACxC,CAAC;YACF,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,GAAe,EAAE,CAAC,CAAC;QACzC,CAAC,CACD,CAAC;IACH,CAAC;IAQO,eAAe,CACtB,MAAyB,EACzB,cAAuB;QAEvB,IAAI,cAAc;YAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAEhE,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;YACrB,KAAK,WAAW;gBACf,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;YAChD,KAAK,aAAa;gBACjB,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;YAClD,KAAK,SAAS;gBACb,OAAO;oBACN,MAAM,EAAE,SAAS;oBACjB,MAAM,EAAE,oBAAoB;iBAC5B,CAAC;YACH,KAAK,iBAAiB;gBACrB,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC;YACxD,KAAK,SAAS;gBACb,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;YACtD,KAAK,QAAQ;gBACZ,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAC9C,CAAC;IACF,CAAC;CACD,CAAA;;AAlUM;IADL,IAAA,uBAAU,GAAE;;;;iEAMZ;AAUK;IAFL,IAAA,0BAAa,EAAC,0BAA0B,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,CAAC;IAC3F,IAAA,6BAAgB,GAAE;;;;+DAUlB;4CA5EW,iCAAiC;IAD7C,IAAA,YAAO,GAAE;qCAWiB,uBAAM,EACG,wBAAe,EACjB,wBAAa,EACV,wCAAmC,EAC5C,yDAA0B,EACzB,uDAAyB,EACjB,2BAAgB,EACnB,sEAAgC,EACtC,kBAAO,EACF,4BAAY;GAnBhC,iCAAiC,CAsX7C"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export declare const isTransientActivationError: (error: Error) => boolean;
|
|
2
|
-
export declare function retryTriggerActivation(activate: () => Promise<void>, maxAttempts: number): Promise<void>;
|
|
2
|
+
export declare function retryTriggerActivation(activate: () => Promise<void>, maxAttempts: number, signal: AbortSignal): Promise<void>;
|
|
@@ -8,17 +8,18 @@ const n8n_workflow_1 = require("n8n-workflow");
|
|
|
8
8
|
const constants_1 = require("../../constants");
|
|
9
9
|
const isTransientActivationError = (error) => !(error instanceof n8n_workflow_1.WebhookPathTakenError);
|
|
10
10
|
exports.isTransientActivationError = isTransientActivationError;
|
|
11
|
-
async function retryTriggerActivation(activate, maxAttempts) {
|
|
11
|
+
async function retryTriggerActivation(activate, maxAttempts, signal) {
|
|
12
12
|
for (let attempt = 0;; attempt++) {
|
|
13
|
+
signal.throwIfAborted();
|
|
13
14
|
try {
|
|
14
15
|
await activate();
|
|
15
16
|
return;
|
|
16
17
|
}
|
|
17
18
|
catch (error) {
|
|
18
19
|
const isLastAttempt = attempt >= maxAttempts - 1;
|
|
19
|
-
if (!(0, exports.isTransientActivationError)((0, ensure_error_1.ensureError)(error)) || isLastAttempt)
|
|
20
|
+
if (!(0, exports.isTransientActivationError)((0, ensure_error_1.ensureError)(error)) || isLastAttempt || signal.aborted)
|
|
20
21
|
throw error;
|
|
21
|
-
await (0, sleep_1.sleep)(Math.min(constants_1.WORKFLOW_REACTIVATE_INITIAL_TIMEOUT * 2 ** attempt, constants_1.WORKFLOW_REACTIVATE_MAX_TIMEOUT));
|
|
22
|
+
await (0, sleep_1.sleep)(Math.min(constants_1.WORKFLOW_REACTIVATE_INITIAL_TIMEOUT * 2 ** attempt, constants_1.WORKFLOW_REACTIVATE_MAX_TIMEOUT), signal);
|
|
22
23
|
}
|
|
23
24
|
}
|
|
24
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trigger-activation-retry.js","sourceRoot":"","sources":["../../../src/workflows/triggers/trigger-activation-retry.ts"],"names":[],"mappings":";;;;AAAA,iEAA6D;AAC7D,4CAAyC;AACzC,+CAAqD;AAErD,2CAAmG;AAK5F,MAAM,0BAA0B,GAAG,CAAC,KAAY,EAAW,EAAE,CACnE,CAAC,CAAC,KAAK,YAAY,oCAAqB,CAAC,CAAC;AAD9B,QAAA,0BAA0B,GAA1B,0BAA0B,CACI;
|
|
1
|
+
{"version":3,"file":"trigger-activation-retry.js","sourceRoot":"","sources":["../../../src/workflows/triggers/trigger-activation-retry.ts"],"names":[],"mappings":";;;;AAAA,iEAA6D;AAC7D,4CAAyC;AACzC,+CAAqD;AAErD,2CAAmG;AAK5F,MAAM,0BAA0B,GAAG,CAAC,KAAY,EAAW,EAAE,CACnE,CAAC,CAAC,KAAK,YAAY,oCAAqB,CAAC,CAAC;AAD9B,QAAA,0BAA0B,GAA1B,0BAA0B,CACI;AAWpC,KAAK,iCACX,QAA6B,EAC7B,WAAmB,EACnB,MAAmB;IAEnB,KAAK,IAAI,OAAO,GAAG,CAAC,GAAI,OAAO,EAAE,EAAE,CAAC;QACnC,MAAM,CAAC,cAAc,EAAE,CAAC;QACxB,IAAI,CAAC;YACJ,MAAM,QAAQ,EAAE,CAAC;YACjB,OAAO;QACR,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,aAAa,GAAG,OAAO,IAAI,WAAW,GAAG,CAAC,CAAC;YACjD,IAAI,CAAC,IAAA,QAAA,0BAA0B,EAAC,IAAA,0BAAW,EAAC,KAAK,CAAC,CAAC,IAAI,aAAa,IAAI,MAAM,CAAC,OAAO;gBACrF,MAAM,KAAK,CAAC;YAKb,MAAM,IAAA,aAAK,EACV,IAAI,CAAC,GAAG,CACP,+CAAmC,GAAG,CAAC,IAAI,OAAO,EAClD,2CAA+B,CAC/B,EACD,MAAM,CACN,CAAC;QACH,CAAC;IACF,CAAC;AACF,CAAC"}
|
|
@@ -16,6 +16,10 @@ export type WorkflowTriggerVersion = {
|
|
|
16
16
|
nodes: INode[];
|
|
17
17
|
connections: IConnections;
|
|
18
18
|
};
|
|
19
|
+
export interface TriggerOperationAbort {
|
|
20
|
+
signal: AbortSignal;
|
|
21
|
+
onDetached: (work: Promise<unknown>) => void;
|
|
22
|
+
}
|
|
19
23
|
export type TriggerActivationFailure = {
|
|
20
24
|
nodeId: INode['id'];
|
|
21
25
|
nodeName: string;
|
|
@@ -45,9 +49,9 @@ export declare class WorkflowTriggerActivator {
|
|
|
45
49
|
getUnregisteredNonWebhookTriggerNodeIds(workflowId: WorkflowId, desiredNodes: INode[]): Set<INode['id']>;
|
|
46
50
|
getNodesWithUnregisteredWebhooks(dbWorkflow: WorkflowEntity, version: WorkflowTriggerVersion): Promise<Set<INode['id']>>;
|
|
47
51
|
private getNonWebhookTriggerNodeIds;
|
|
48
|
-
activate(dbWorkflow: WorkflowEntity, version: WorkflowTriggerVersion, nodeIds: Set<INode['id']>, activationMode: WorkflowActivateMode): Promise<TriggerActivationOutcome>;
|
|
52
|
+
activate(dbWorkflow: WorkflowEntity, version: WorkflowTriggerVersion, nodeIds: Set<INode['id']>, activationMode: WorkflowActivateMode, abort: TriggerOperationAbort): Promise<TriggerActivationOutcome>;
|
|
49
53
|
private activateInternal;
|
|
50
|
-
deactivate(dbWorkflow: WorkflowEntity, version: WorkflowTriggerVersion, nodeIds: Set<INode['id']
|
|
54
|
+
deactivate(dbWorkflow: WorkflowEntity, version: WorkflowTriggerVersion, nodeIds: Set<INode['id']>, abort: TriggerOperationAbort): Promise<void>;
|
|
51
55
|
private deactivateInternal;
|
|
52
56
|
updateTriggerCount(dbWorkflow: WorkflowEntity, version: WorkflowTriggerVersion): Promise<void>;
|
|
53
57
|
private emitTriggerOperation;
|