n8n 2.42.1 → 2.42.3
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/credentials/credentials.service.js +1 -1
- package/dist/credentials/credentials.service.js.map +1 -1
- package/dist/credentials-helper.js +6 -0
- package/dist/credentials-helper.js.map +1 -1
- package/dist/events/maps/queue-metrics.event-map.d.ts +4 -0
- package/dist/events/relays/telemetry.event-relay.d.ts +5 -1
- package/dist/events/relays/telemetry.event-relay.js +32 -18
- package/dist/events/relays/telemetry.event-relay.js.map +1 -1
- package/dist/execution-lifecycle/execute-error-workflow.js +2 -1
- package/dist/execution-lifecycle/execute-error-workflow.js.map +1 -1
- package/dist/instance-settings-loader/loaders/community-packages.instance-settings-loader.js +4 -14
- package/dist/instance-settings-loader/loaders/community-packages.instance-settings-loader.js.map +1 -1
- package/dist/metrics/prometheus/queue-metrics.service.js +8 -0
- package/dist/metrics/prometheus/queue-metrics.service.js.map +1 -1
- package/dist/modules/community-packages/community-node-types-utils.d.ts +6 -0
- package/dist/modules/community-packages/community-node-types-utils.js +8 -0
- package/dist/modules/community-packages/community-node-types-utils.js.map +1 -1
- package/dist/modules/community-packages/community-packages.controller.d.ts +5 -3
- package/dist/modules/community-packages/community-packages.controller.js +12 -8
- package/dist/modules/community-packages/community-packages.controller.js.map +1 -1
- package/dist/modules/community-packages/community-packages.lifecycle.service.d.ts +0 -3
- package/dist/modules/community-packages/community-packages.lifecycle.service.js +27 -26
- package/dist/modules/community-packages/community-packages.lifecycle.service.js.map +1 -1
- package/dist/modules/instance-ai/onboarding-opening.js +1 -1
- package/dist/modules/instance-ai/onboarding-opening.js.map +1 -1
- package/dist/modules/mcp/mcp.service.d.ts +5 -3
- package/dist/modules/mcp/mcp.service.js +8 -6
- package/dist/modules/mcp/mcp.service.js.map +1 -1
- package/dist/modules/mcp/tools/get-execution.tool.d.ts +2 -1
- package/dist/modules/mcp/tools/get-execution.tool.js +4 -1
- package/dist/modules/mcp/tools/get-execution.tool.js.map +1 -1
- package/dist/modules/mcp/tools/workflow-builder/install-community-node.tool.js +1 -1
- package/dist/modules/mcp/tools/workflow-builder/install-community-node.tool.js.map +1 -1
- package/dist/modules/mcp/tools/workflow-builder/update-workflow.tool.d.ts +2 -3
- package/dist/modules/mcp/tools/workflow-builder/update-workflow.tool.js +26 -51
- package/dist/modules/mcp/tools/workflow-builder/update-workflow.tool.js.map +1 -1
- package/dist/modules/mcp/tools/workflow-builder/workflow-operations.js +1 -1
- package/dist/modules/mcp/tools/workflow-builder/workflow-operations.js.map +1 -1
- package/dist/modules/n8n-packages/entities/workflow/workflow-importer.js +1 -0
- package/dist/modules/n8n-packages/entities/workflow/workflow-importer.js.map +1 -1
- package/dist/modules/oauth-server/oauth-server.service.js +5 -1
- package/dist/modules/oauth-server/oauth-server.service.js.map +1 -1
- package/dist/posthog/index.d.ts +1 -1
- package/dist/posthog/index.js +2 -3
- package/dist/posthog/index.js.map +1 -1
- package/dist/public-api/v1/controllers/community-packages.public.controller.js +2 -2
- package/dist/public-api/v1/controllers/community-packages.public.controller.js.map +1 -1
- package/dist/public-api/v1/openapi.yml +2 -8
- package/dist/requests.d.ts +0 -7
- package/dist/scaling/constants.d.ts +1 -0
- package/dist/scaling/constants.js +2 -1
- package/dist/scaling/constants.js.map +1 -1
- package/dist/scaling/job-outcome-tracker.d.ts +37 -0
- package/dist/scaling/job-outcome-tracker.js +162 -0
- package/dist/scaling/job-outcome-tracker.js.map +1 -0
- package/dist/scaling/scaling.service.d.ts +4 -2
- package/dist/scaling/scaling.service.js +23 -10
- package/dist/scaling/scaling.service.js.map +1 -1
- package/dist/telemetry/index.d.ts +5 -1
- package/dist/telemetry/index.js +4 -4
- package/dist/telemetry/index.js.map +1 -1
- package/dist/workflow-execute-additional-data.js +1 -3
- package/dist/workflow-execute-additional-data.js.map +1 -1
- package/dist/workflow-runner.js +19 -6
- package/dist/workflow-runner.js.map +1 -1
- package/dist/workflows/error-workflow-validation.service.d.ts +35 -0
- package/dist/workflows/error-workflow-validation.service.js +87 -0
- package/dist/workflows/error-workflow-validation.service.js.map +1 -0
- package/dist/workflows/workflow.service.d.ts +5 -1
- package/dist/workflows/workflow.service.js +33 -3
- package/dist/workflows/workflow.service.js.map +1 -1
- package/package.json +29 -29
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-server.service.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth-server.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oauth-server.service.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth-server.service.ts"],"names":[],"mappings":"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"}
|
package/dist/posthog/index.d.ts
CHANGED
|
@@ -23,7 +23,7 @@ export declare class PostHogClient {
|
|
|
23
23
|
}): void;
|
|
24
24
|
groupIdentify({ instanceId, distinctId, properties, }: {
|
|
25
25
|
instanceId: string;
|
|
26
|
-
distinctId
|
|
26
|
+
distinctId: string;
|
|
27
27
|
properties: Record<string, string | number> | undefined;
|
|
28
28
|
}): void;
|
|
29
29
|
identify({ distinctId, properties, }: {
|
package/dist/posthog/index.js
CHANGED
|
@@ -68,16 +68,15 @@ let PostHogClient = class PostHogClient {
|
|
|
68
68
|
});
|
|
69
69
|
}
|
|
70
70
|
groupIdentify({ instanceId, distinctId, properties, }) {
|
|
71
|
-
if (!instanceId)
|
|
71
|
+
if (!instanceId || !distinctId)
|
|
72
72
|
return;
|
|
73
73
|
this.postHog?.capture({
|
|
74
|
-
distinctId
|
|
74
|
+
distinctId,
|
|
75
75
|
event: '$groupidentify',
|
|
76
76
|
properties: {
|
|
77
77
|
$group_type: POSTHOG_GROUP_TYPE_INSTANCE,
|
|
78
78
|
$group_key: instanceId,
|
|
79
79
|
$group_set: properties,
|
|
80
|
-
...(!distinctId && { $process_person_profile: false }),
|
|
81
80
|
},
|
|
82
81
|
groups: {
|
|
83
82
|
[POSTHOG_GROUP_TYPE_INSTANCE]: instanceId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/posthog/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAYwB;AACxB,wCAA2C;AAE3C,gCAAkC;AAElC,uCAA4C;AAI5C,2CAA0C;AAM1C,MAAM,2BAA2B,GAAG,SAAS,CAAC;AAE9C,MAAM,kBAAkB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAE1C,MAAM,qBAAqB,GAAG,IAAI,CAAC;AAEnC,SAAS,iBAAiB,CAAC,KAAyB;IACnD,MAAM,SAAS,GAAG,KAAK,EAAE,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7D,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC1E,CAAC;AAYM,IAAM,aAAa,GAAnB,MAAM,aAAa;IAKzB,YACkB,gBAAkC,EAClC,YAA0B;QAD1B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,iBAAY,GAAZ,YAAY,CAAc;QAJ3B,eAAU,GAAG,IAAI,GAAG,EAAuB,CAAC;IAK1D,CAAC;IAEJ,KAAK,CAAC,IAAI;QACT,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC;QACjE,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAO;QACR,CAAC;QAED,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC;QACjD,IAAI,CAAC,OAAO,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE;YAChD,IAAI,EAAE,aAAa,CAAC,OAAO;SAC3B,CAAC,CAAC;IACJ,CAAC;IAED,0BAA0B,CAAC,GAAgB;QAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO;QAEtE,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;YAC3B,MAAM,SAAS,GAAG,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC,CAAC;YACrE,IAAI,CAAC,SAAS;gBAAE,OAAO,IAAI,EAAE,CAAC;YAE9B,OAAO,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,EAAE,IAAI,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,IAAI;QACT,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACtC,CAAC;IACF,CAAC;IAED,KAAK,CAAC,OAAiF;QACtF,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,gBAAgB,CAAC,UAAU;YAAE,OAAO;QAEnF,MAAM,UAAU,GAAG,OAAO,EAAE,UAAU,EAAE,WAAW,CAAC;QAEpD,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC;YACrB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,UAAU,EAAE,OAAO,CAAC,MAAM;YAC1B,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,GAAG,CAAC,OAAO,UAAU,KAAK,QAAQ,IAAI;gBACrC,MAAM,EAAE,EAAE,CAAC,2BAA2B,CAAC,EAAE,UAAU,EAAE;aACrD,CAAC;SACF,CAAC,CAAC;IACJ,CAAC;IAED,aAAa,CAAC,EACb,UAAU,EACV,UAAU,EACV,UAAU,GAKV;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/posthog/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,11 +26,11 @@ let CommunityPackagesPublicController = class CommunityPackagesPublicController
|
|
|
26
26
|
return packages.map(community_packages_mapper_1.toCommunityPackagePublic);
|
|
27
27
|
}
|
|
28
28
|
async installPackage(req, _res, body) {
|
|
29
|
-
const installedPackage = await this.communityPackagesLifecycleService.install({ name: body.name, version: body.version
|
|
29
|
+
const installedPackage = await this.communityPackagesLifecycleService.install({ name: body.name, version: body.version }, req.user, 'publicApi');
|
|
30
30
|
return (0, community_packages_mapper_1.toCommunityPackagePublic)(installedPackage);
|
|
31
31
|
}
|
|
32
32
|
async updatePackage(req, _res, name, body) {
|
|
33
|
-
const updated = await this.communityPackagesLifecycleService.update({ name, version: body.version
|
|
33
|
+
const updated = await this.communityPackagesLifecycleService.update({ name, version: body.version }, req.user, 'notFound');
|
|
34
34
|
return (0, community_packages_mapper_1.toCommunityPackagePublic)(updated);
|
|
35
35
|
}
|
|
36
36
|
async uninstallPackage(req, _res, packageName) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"community-packages.public.controller.js","sourceRoot":"","sources":["../../../../src/public-api/v1/controllers/community-packages.public.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAOwB;AAExB,gDAeyB;AAGzB,4HAAsH;AACtH,qHAAiH;AAG1G,IAAM,iCAAiC,GAAvC,MAAM,iCAAiC;IAC7C,YACkB,iCAAoE;iDAApE,iCAAiC;IAChD,CAAC;IAQE,AAAN,KAAK,CAAC,oBAAoB,CACzB,IAA0B,EAC1B,IAAc,EACP,MAAqC;QAE5C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iCAAiC,CAAC,qBAAqB,EAAE,CAAC;QAEtF,OAAO,QAAQ,CAAC,GAAG,CAAC,oDAAwB,CAAC,CAAC;IAC/C,CAAC;IAQK,AAAN,KAAK,CAAC,cAAc,CACnB,GAAyB,EACzB,IAAc,EACR,IAAsC;QAE5C,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,iCAAiC,CAAC,OAAO,CAC5E,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"community-packages.public.controller.js","sourceRoot":"","sources":["../../../../src/public-api/v1/controllers/community-packages.public.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -2161,10 +2161,7 @@ paths:
|
|
|
2161
2161
|
description: npm package name. Unscoped names start with n8n-nodes-. Scoped names use the @[author]/n8n-nodes- form.
|
|
2162
2162
|
version:
|
|
2163
2163
|
type: string
|
|
2164
|
-
description: Semver version or npm dist-tag, such as latest or beta
|
|
2165
|
-
verify:
|
|
2166
|
-
type: boolean
|
|
2167
|
-
description: Whether to verify the package against the n8n-vetted package list. Required when the instance has N8N_UNVERIFIED_PACKAGES_ENABLED=false.
|
|
2164
|
+
description: Semver version or npm dist-tag, such as latest or beta. When unverified packages are disabled, only versions verified by n8n can be installed.
|
|
2168
2165
|
required:
|
|
2169
2166
|
- name
|
|
2170
2167
|
responses:
|
|
@@ -2208,10 +2205,7 @@ paths:
|
|
|
2208
2205
|
properties:
|
|
2209
2206
|
version:
|
|
2210
2207
|
type: string
|
|
2211
|
-
description: Semver version or npm dist-tag to update to, such as latest or beta
|
|
2212
|
-
verify:
|
|
2213
|
-
type: boolean
|
|
2214
|
-
description: Whether to verify the package against the n8n-vetted package list. Setting to false will allow installing or updating to an unverified version. Default is true.
|
|
2208
|
+
description: Semver version or npm dist-tag to update to, such as latest or beta. When unverified packages are disabled, only versions verified by n8n can be installed.
|
|
2215
2209
|
responses:
|
|
2216
2210
|
'200':
|
|
2217
2211
|
description: Operation successful.
|
package/dist/requests.d.ts
CHANGED
|
@@ -162,16 +162,9 @@ export declare namespace AnnotationTagsRequest {
|
|
|
162
162
|
}
|
|
163
163
|
export declare namespace NodeRequest {
|
|
164
164
|
type GetAll = AuthenticatedRequest;
|
|
165
|
-
type Post = AuthenticatedRequest<{}, {}, {
|
|
166
|
-
name?: string;
|
|
167
|
-
verify?: boolean;
|
|
168
|
-
version?: string;
|
|
169
|
-
checksum?: string;
|
|
170
|
-
}>;
|
|
171
165
|
type Delete = AuthenticatedRequest<{}, {}, {}, {
|
|
172
166
|
name: string;
|
|
173
167
|
}>;
|
|
174
|
-
type Update = Post;
|
|
175
168
|
}
|
|
176
169
|
export declare namespace LicenseRequest {
|
|
177
170
|
type Activate = AuthenticatedRequest<{}, {}, {
|
|
@@ -7,3 +7,4 @@ export declare const SUBSCRIBER_LIVENESS_TIMEOUT_MS: number;
|
|
|
7
7
|
export declare const MAX_PUBSUB_PAYLOAD_BYTES: number;
|
|
8
8
|
export declare const SELF_SEND_COMMANDS: Set<"add-webhooks-triggers-and-pollers" | "agent-chat-integration-changed" | "agent-chat-leader-channel-request" | "agent-chat-leader-channel-result" | "agent-chat-subscription-changed" | "agent-config-changed" | "agent-tasks-changed" | "cancel-agent-background-job" | "cancel-agent-chat-execution" | "cancel-collection" | "cancel-test-run" | "clear-test-webhooks" | "community-package-install" | "community-package-uninstall" | "community-package-update" | "display-workflow-activation" | "display-workflow-activation-error" | "display-workflow-deactivation" | "display-workflow-publication-status" | "get-worker-id" | "get-worker-status" | "redaction-floor-changed" | "relay-agent-background-tasks-update" | "relay-agent-execution-update" | "relay-agent-message-queue-update" | "relay-agent-queued-chat" | "relay-agent-update" | "relay-chat-human-message" | "relay-chat-message-edit" | "relay-chat-stream-event" | "relay-execution-lifecycle-event" | "relay-instance-ai-event" | "relay-instance-ai-task-control" | "reload-external-secrets-providers" | "reload-instance-ai-settings" | "reload-license" | "reload-mcp-registry" | "reload-oidc-config" | "reload-otel-config" | "reload-overwrite-credentials" | "reload-saml-config" | "reload-source-control-config" | "reload-sso-provisioning-configuration" | "remove-triggers-and-pollers" | "restart-event-bus" | "resume-agent-workflow-tool" | "stop-execution" | "wake-agent-background-job" | "workflow-publish-wake-up">;
|
|
9
9
|
export declare const IMMEDIATE_COMMANDS: Set<"add-webhooks-triggers-and-pollers" | "agent-chat-integration-changed" | "agent-chat-leader-channel-request" | "agent-chat-leader-channel-result" | "agent-chat-subscription-changed" | "agent-config-changed" | "agent-tasks-changed" | "cancel-agent-background-job" | "cancel-agent-chat-execution" | "cancel-collection" | "cancel-test-run" | "clear-test-webhooks" | "community-package-install" | "community-package-uninstall" | "community-package-update" | "display-workflow-activation" | "display-workflow-activation-error" | "display-workflow-deactivation" | "display-workflow-publication-status" | "get-worker-id" | "get-worker-status" | "redaction-floor-changed" | "relay-agent-background-tasks-update" | "relay-agent-execution-update" | "relay-agent-message-queue-update" | "relay-agent-queued-chat" | "relay-agent-update" | "relay-chat-human-message" | "relay-chat-message-edit" | "relay-chat-stream-event" | "relay-execution-lifecycle-event" | "relay-instance-ai-event" | "relay-instance-ai-task-control" | "reload-external-secrets-providers" | "reload-instance-ai-settings" | "reload-license" | "reload-mcp-registry" | "reload-oidc-config" | "reload-otel-config" | "reload-overwrite-credentials" | "reload-saml-config" | "reload-source-control-config" | "reload-sso-provisioning-configuration" | "remove-triggers-and-pollers" | "restart-event-bus" | "resume-agent-workflow-tool" | "stop-execution" | "wake-agent-background-job" | "workflow-publish-wake-up">;
|
|
10
|
+
export declare const JOB_WAIT_RECHECK_INTERVAL_MS: number;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.IMMEDIATE_COMMANDS = exports.SELF_SEND_COMMANDS = exports.MAX_PUBSUB_PAYLOAD_BYTES = exports.SUBSCRIBER_LIVENESS_TIMEOUT_MS = exports.SUBSCRIBER_LIVENESS_INTERVAL_MS = exports.MCP_RELAY_PUBSUB_CHANNEL = exports.WORKER_RESPONSE_PUBSUB_CHANNEL = exports.COMMAND_PUBSUB_CHANNEL = exports.JOB_TYPE_NAME = void 0;
|
|
3
|
+
exports.JOB_WAIT_RECHECK_INTERVAL_MS = exports.IMMEDIATE_COMMANDS = exports.SELF_SEND_COMMANDS = exports.MAX_PUBSUB_PAYLOAD_BYTES = exports.SUBSCRIBER_LIVENESS_TIMEOUT_MS = exports.SUBSCRIBER_LIVENESS_INTERVAL_MS = exports.MCP_RELAY_PUBSUB_CHANNEL = exports.WORKER_RESPONSE_PUBSUB_CHANNEL = exports.COMMAND_PUBSUB_CHANNEL = exports.JOB_TYPE_NAME = void 0;
|
|
4
4
|
const constants_1 = require("@n8n/constants");
|
|
5
5
|
exports.JOB_TYPE_NAME = 'job';
|
|
6
6
|
exports.COMMAND_PUBSUB_CHANNEL = 'n8n.commands';
|
|
@@ -42,4 +42,5 @@ exports.IMMEDIATE_COMMANDS = new Set([
|
|
|
42
42
|
'display-workflow-publication-status',
|
|
43
43
|
'workflow-publish-wake-up',
|
|
44
44
|
]);
|
|
45
|
+
exports.JOB_WAIT_RECHECK_INTERVAL_MS = 60 * constants_1.Time.seconds.toMilliseconds;
|
|
45
46
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/scaling/constants.ts"],"names":[],"mappings":";;;AAAA,8CAAsC;AAIzB,QAAA,aAAa,GAAG,KAAK,CAAC;AAGtB,QAAA,sBAAsB,GAAG,cAAc,CAAC;AAGxC,QAAA,8BAA8B,GAAG,qBAAqB,CAAC;AAGvD,QAAA,wBAAwB,GAAG,eAAe,CAAC;AAG3C,QAAA,+BAA+B,GAAG,EAAE,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;AAGnE,QAAA,8BAA8B,GAAG,EAAE,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;AAMlE,QAAA,wBAAwB,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;AAK3C,QAAA,kBAAkB,GAAG,IAAI,GAAG,CAA4B;IACpE,mCAAmC;IACnC,6BAA6B;IAE7B,0BAA0B;CAC1B,CAAC,CAAC;AAMU,QAAA,kBAAkB,GAAG,IAAI,GAAG,CAA4B;IACpE,mCAAmC;IACnC,6BAA6B;IAC7B,iCAAiC;IACjC,yBAAyB;IACzB,8BAA8B;IAC9B,yBAAyB;IACzB,6BAA6B;IAC7B,kCAAkC;IAClC,qCAAqC;IACrC,oBAAoB;IACpB,4BAA4B;IAC5B,6BAA6B;IAC7B,2BAA2B;IAC3B,yBAAyB;IACzB,gCAAgC;IAChC,iCAAiC;IACjC,gCAAgC;IAGhC,mCAAmC;IACnC,kCAAkC;IAClC,iBAAiB;IACjB,gBAAgB;IAChB,6BAA6B;IAC7B,+BAA+B;IAC/B,mCAAmC;IACnC,qCAAqC;IACrC,0BAA0B;CAC1B,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/scaling/constants.ts"],"names":[],"mappings":";;;AAAA,8CAAsC;AAIzB,QAAA,aAAa,GAAG,KAAK,CAAC;AAGtB,QAAA,sBAAsB,GAAG,cAAc,CAAC;AAGxC,QAAA,8BAA8B,GAAG,qBAAqB,CAAC;AAGvD,QAAA,wBAAwB,GAAG,eAAe,CAAC;AAG3C,QAAA,+BAA+B,GAAG,EAAE,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;AAGnE,QAAA,8BAA8B,GAAG,EAAE,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;AAMlE,QAAA,wBAAwB,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;AAK3C,QAAA,kBAAkB,GAAG,IAAI,GAAG,CAA4B;IACpE,mCAAmC;IACnC,6BAA6B;IAE7B,0BAA0B;CAC1B,CAAC,CAAC;AAMU,QAAA,kBAAkB,GAAG,IAAI,GAAG,CAA4B;IACpE,mCAAmC;IACnC,6BAA6B;IAC7B,iCAAiC;IACjC,yBAAyB;IACzB,8BAA8B;IAC9B,yBAAyB;IACzB,6BAA6B;IAC7B,kCAAkC;IAClC,qCAAqC;IACrC,oBAAoB;IACpB,4BAA4B;IAC5B,6BAA6B;IAC7B,2BAA2B;IAC3B,yBAAyB;IACzB,gCAAgC;IAChC,iCAAiC;IACjC,gCAAgC;IAGhC,mCAAmC;IACnC,kCAAkC;IAClC,iBAAiB;IACjB,gBAAgB;IAChB,6BAA6B;IAC7B,+BAA+B;IAC/B,mCAAmC;IACnC,qCAAqC;IACrC,0BAA0B;CAC1B,CAAC,CAAC;AAGU,QAAA,4BAA4B,GAAG,EAAE,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { Logger } from '@n8n/backend-common';
|
|
2
|
+
import { ExecutionRepository } from '@n8n/db';
|
|
3
|
+
import { ActiveExecutions } from '../active-executions';
|
|
4
|
+
import { EventService } from '../events/event.service';
|
|
5
|
+
import type { Job, JobFinishedProps, JobId } from './scaling.types';
|
|
6
|
+
type PendingJobWait = {
|
|
7
|
+
jobKey: string;
|
|
8
|
+
resolve: () => void;
|
|
9
|
+
reject: (error: Error) => void;
|
|
10
|
+
};
|
|
11
|
+
export declare class JobOutcomeTracker {
|
|
12
|
+
private readonly logger;
|
|
13
|
+
private readonly activeExecutions;
|
|
14
|
+
private readonly executionRepository;
|
|
15
|
+
private readonly eventService;
|
|
16
|
+
private readonly results;
|
|
17
|
+
private readonly failures;
|
|
18
|
+
private readonly pendingWaits;
|
|
19
|
+
private readonly executionIdByJobKey;
|
|
20
|
+
private recheckTimer?;
|
|
21
|
+
private recheckInFlight?;
|
|
22
|
+
constructor(logger: Logger, activeExecutions: ActiveExecutions, executionRepository: ExecutionRepository, eventService: EventService);
|
|
23
|
+
recordFinished(executionId: string, result?: JobFinishedProps): void;
|
|
24
|
+
recordFailed(executionId: string, error: Error): void;
|
|
25
|
+
settleByJobKey(queueName: string, jobId: JobId, error?: Error): void;
|
|
26
|
+
waitFor(job: Job): Promise<void>;
|
|
27
|
+
popResult(executionId: string): JobFinishedProps | undefined;
|
|
28
|
+
drop(executionId: string): PendingJobWait | undefined;
|
|
29
|
+
clear(): void;
|
|
30
|
+
recheckAll(): Promise<void>;
|
|
31
|
+
private recheckPendingWaits;
|
|
32
|
+
private readStatuses;
|
|
33
|
+
private settle;
|
|
34
|
+
private startRecheckTimer;
|
|
35
|
+
private stopRecheckTimer;
|
|
36
|
+
}
|
|
37
|
+
export {};
|
|
@@ -0,0 +1,162 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.JobOutcomeTracker = void 0;
|
|
13
|
+
const backend_common_1 = require("@n8n/backend-common");
|
|
14
|
+
const db_1 = require("@n8n/db");
|
|
15
|
+
const di_1 = require("@n8n/di");
|
|
16
|
+
const active_executions_1 = require("../active-executions");
|
|
17
|
+
const event_service_1 = require("../events/event.service");
|
|
18
|
+
const constants_1 = require("./constants");
|
|
19
|
+
const toJobKey = (queueName, jobId) => `${queueName}:${jobId.toString()}`;
|
|
20
|
+
const IN_FLIGHT_STATUSES = new Set(['new', 'running', 'unknown']);
|
|
21
|
+
const SUCCEEDED_STATUSES = new Set(['success', 'waiting', 'deleted']);
|
|
22
|
+
const FAILED_RESPONSE = {
|
|
23
|
+
body: { message: 'Workflow execution failed' },
|
|
24
|
+
statusCode: 500,
|
|
25
|
+
};
|
|
26
|
+
let JobOutcomeTracker = class JobOutcomeTracker {
|
|
27
|
+
constructor(logger, activeExecutions, executionRepository, eventService) {
|
|
28
|
+
this.logger = logger;
|
|
29
|
+
this.activeExecutions = activeExecutions;
|
|
30
|
+
this.executionRepository = executionRepository;
|
|
31
|
+
this.eventService = eventService;
|
|
32
|
+
this.results = new Map();
|
|
33
|
+
this.failures = new Map();
|
|
34
|
+
this.pendingWaits = new Map();
|
|
35
|
+
this.executionIdByJobKey = new Map();
|
|
36
|
+
this.logger = this.logger.scoped('scaling');
|
|
37
|
+
}
|
|
38
|
+
recordFinished(executionId, result) {
|
|
39
|
+
if (result && this.activeExecutions.has(executionId)) {
|
|
40
|
+
this.results.set(executionId, result);
|
|
41
|
+
}
|
|
42
|
+
this.settle(executionId, { succeeded: result?.success ?? true });
|
|
43
|
+
}
|
|
44
|
+
recordFailed(executionId, error) {
|
|
45
|
+
const settled = this.settle(executionId, { error, succeeded: false });
|
|
46
|
+
if (settled)
|
|
47
|
+
return;
|
|
48
|
+
if (this.activeExecutions.has(executionId))
|
|
49
|
+
this.failures.set(executionId, error);
|
|
50
|
+
}
|
|
51
|
+
settleByJobKey(queueName, jobId, error) {
|
|
52
|
+
const executionId = this.executionIdByJobKey.get(toJobKey(queueName, jobId));
|
|
53
|
+
if (!executionId)
|
|
54
|
+
return;
|
|
55
|
+
this.settle(executionId, { error, succeeded: !error });
|
|
56
|
+
}
|
|
57
|
+
async waitFor(job) {
|
|
58
|
+
const { executionId } = job.data;
|
|
59
|
+
if (this.results.has(executionId))
|
|
60
|
+
return;
|
|
61
|
+
const earlyFailure = this.failures.get(executionId);
|
|
62
|
+
if (earlyFailure) {
|
|
63
|
+
this.failures.delete(executionId);
|
|
64
|
+
throw earlyFailure;
|
|
65
|
+
}
|
|
66
|
+
await new Promise((resolve, reject) => {
|
|
67
|
+
const jobKey = toJobKey(job.queue.name, job.id);
|
|
68
|
+
this.pendingWaits.set(executionId, { jobKey, resolve, reject });
|
|
69
|
+
this.executionIdByJobKey.set(jobKey, executionId);
|
|
70
|
+
this.startRecheckTimer();
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
popResult(executionId) {
|
|
74
|
+
const result = this.results.get(executionId);
|
|
75
|
+
this.results.delete(executionId);
|
|
76
|
+
this.failures.delete(executionId);
|
|
77
|
+
return result;
|
|
78
|
+
}
|
|
79
|
+
drop(executionId) {
|
|
80
|
+
const wait = this.pendingWaits.get(executionId);
|
|
81
|
+
if (!wait)
|
|
82
|
+
return undefined;
|
|
83
|
+
this.pendingWaits.delete(executionId);
|
|
84
|
+
this.executionIdByJobKey.delete(wait.jobKey);
|
|
85
|
+
if (this.pendingWaits.size === 0)
|
|
86
|
+
this.stopRecheckTimer();
|
|
87
|
+
return wait;
|
|
88
|
+
}
|
|
89
|
+
clear() {
|
|
90
|
+
for (const executionId of this.pendingWaits.keys())
|
|
91
|
+
this.drop(executionId);
|
|
92
|
+
}
|
|
93
|
+
async recheckAll() {
|
|
94
|
+
if (this.pendingWaits.size === 0)
|
|
95
|
+
return;
|
|
96
|
+
this.recheckInFlight ??= this.recheckPendingWaits().finally(() => {
|
|
97
|
+
this.recheckInFlight = undefined;
|
|
98
|
+
});
|
|
99
|
+
await this.recheckInFlight;
|
|
100
|
+
}
|
|
101
|
+
async recheckPendingWaits() {
|
|
102
|
+
const statusById = await this.readStatuses([...this.pendingWaits.keys()]);
|
|
103
|
+
if (!statusById)
|
|
104
|
+
return;
|
|
105
|
+
for (const [executionId, status] of statusById) {
|
|
106
|
+
if (IN_FLIGHT_STATUSES.has(status))
|
|
107
|
+
continue;
|
|
108
|
+
if (!this.pendingWaits.has(executionId))
|
|
109
|
+
continue;
|
|
110
|
+
this.logger.warn(`Execution ${executionId} ended without a completion event, resolving the wait from the DB`, { executionId, status });
|
|
111
|
+
this.eventService.emit('job-completion-missed', { status });
|
|
112
|
+
this.settle(executionId, { succeeded: SUCCEEDED_STATUSES.has(status) });
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
async readStatuses(executionIds) {
|
|
116
|
+
try {
|
|
117
|
+
const rows = await this.executionRepository.findStatusesByIds(executionIds);
|
|
118
|
+
const statusById = new Map(rows.map((row) => [row.id, row.status]));
|
|
119
|
+
for (const executionId of executionIds) {
|
|
120
|
+
if (!statusById.has(executionId))
|
|
121
|
+
statusById.set(executionId, 'deleted');
|
|
122
|
+
}
|
|
123
|
+
return statusById;
|
|
124
|
+
}
|
|
125
|
+
catch (error) {
|
|
126
|
+
this.logger.warn(`Failed to read the status of ${executionIds.length} executions, next recheck in ${constants_1.JOB_WAIT_RECHECK_INTERVAL_MS / 1000}s`, { executionIds, error });
|
|
127
|
+
return undefined;
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
settle(executionId, outcome) {
|
|
131
|
+
const wait = this.drop(executionId);
|
|
132
|
+
if (!wait)
|
|
133
|
+
return false;
|
|
134
|
+
this.activeExecutions.resolveResponsePromise(executionId, outcome.succeeded ? {} : FAILED_RESPONSE);
|
|
135
|
+
if (outcome.error) {
|
|
136
|
+
wait.reject(outcome.error);
|
|
137
|
+
}
|
|
138
|
+
else {
|
|
139
|
+
wait.resolve();
|
|
140
|
+
}
|
|
141
|
+
return true;
|
|
142
|
+
}
|
|
143
|
+
startRecheckTimer() {
|
|
144
|
+
if (this.recheckTimer)
|
|
145
|
+
return;
|
|
146
|
+
this.recheckTimer = setInterval(() => {
|
|
147
|
+
void this.recheckAll();
|
|
148
|
+
}, constants_1.JOB_WAIT_RECHECK_INTERVAL_MS).unref();
|
|
149
|
+
}
|
|
150
|
+
stopRecheckTimer() {
|
|
151
|
+
if (!this.recheckTimer)
|
|
152
|
+
return;
|
|
153
|
+
clearInterval(this.recheckTimer);
|
|
154
|
+
this.recheckTimer = undefined;
|
|
155
|
+
}
|
|
156
|
+
};
|
|
157
|
+
exports.JobOutcomeTracker = JobOutcomeTracker;
|
|
158
|
+
exports.JobOutcomeTracker = JobOutcomeTracker = __decorate([
|
|
159
|
+
(0, di_1.Service)(),
|
|
160
|
+
__metadata("design:paramtypes", [backend_common_1.Logger, active_executions_1.ActiveExecutions, db_1.ExecutionRepository, event_service_1.EventService])
|
|
161
|
+
], JobOutcomeTracker);
|
|
162
|
+
//# sourceMappingURL=job-outcome-tracker.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"job-outcome-tracker.js","sourceRoot":"","sources":["../../src/scaling/job-outcome-tracker.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ import { ActiveExecutions } from '../active-executions';
|
|
|
6
6
|
import { EventService } from '../events/event.service';
|
|
7
7
|
import { ExecutionCrashService } from '../executions/execution-crash.service';
|
|
8
8
|
import { ExecutionPersistence } from '../executions/execution-persistence';
|
|
9
|
+
import { JobOutcomeTracker } from './job-outcome-tracker';
|
|
9
10
|
import { JobProcessor } from './job-processor';
|
|
10
11
|
import type { JobQueue, Job, JobData, JobStatus, JobId, JobFinishedProps } from './scaling.types';
|
|
11
12
|
import { WebhookResponseRelay } from './webhook-response-relay';
|
|
@@ -21,11 +22,11 @@ export declare class ScalingService {
|
|
|
21
22
|
private readonly eventService;
|
|
22
23
|
private readonly webhookResponseRelay;
|
|
23
24
|
private readonly executionCrashService;
|
|
25
|
+
private readonly jobOutcomeTracker;
|
|
24
26
|
private readonly queueByName;
|
|
25
27
|
private initialQueueName;
|
|
26
28
|
private createBullQueue?;
|
|
27
|
-
|
|
28
|
-
constructor(logger: Logger, errorReporter: ErrorReporter, activeExecutions: ActiveExecutions, jobProcessor: JobProcessor, globalConfig: GlobalConfig, executionRepository: ExecutionRepository, executionPersistence: ExecutionPersistence, instanceSettings: InstanceSettings, eventService: EventService, webhookResponseRelay: WebhookResponseRelay, executionCrashService: ExecutionCrashService);
|
|
29
|
+
constructor(logger: Logger, errorReporter: ErrorReporter, activeExecutions: ActiveExecutions, jobProcessor: JobProcessor, globalConfig: GlobalConfig, executionRepository: ExecutionRepository, executionPersistence: ExecutionPersistence, instanceSettings: InstanceSettings, eventService: EventService, webhookResponseRelay: WebhookResponseRelay, executionCrashService: ExecutionCrashService, jobOutcomeTracker: JobOutcomeTracker);
|
|
29
30
|
private get defaultQueue();
|
|
30
31
|
getOrCreateQueue(queueName: string): Promise<JobQueue>;
|
|
31
32
|
setupQueue(): Promise<void>;
|
|
@@ -38,6 +39,7 @@ export declare class ScalingService {
|
|
|
38
39
|
private logExecutionsToDrain;
|
|
39
40
|
pingQueue(): Promise<void>;
|
|
40
41
|
popJobResult(executionId: string): JobFinishedProps | undefined;
|
|
42
|
+
waitForJob(job: Job): Promise<void>;
|
|
41
43
|
getPendingJobCounts(): Promise<{
|
|
42
44
|
active: number;
|
|
43
45
|
waiting: number;
|
|
@@ -61,6 +61,7 @@ const execution_crash_service_1 = require("../executions/execution-crash.service
|
|
|
61
61
|
const execution_persistence_1 = require("../executions/execution-persistence");
|
|
62
62
|
const utils_1 = require("../utils");
|
|
63
63
|
const constants_3 = require("./constants");
|
|
64
|
+
const job_outcome_tracker_1 = require("./job-outcome-tracker");
|
|
64
65
|
const job_processor_1 = require("./job-processor");
|
|
65
66
|
const queue_name_1 = require("./queue-name");
|
|
66
67
|
const webhook_response_relay_1 = require("./webhook-response-relay");
|
|
@@ -68,7 +69,7 @@ const DRAIN_POLL_INTERVAL_MS = 500;
|
|
|
68
69
|
const CANCEL_WRITE_BUDGET_SHARE = 0.5;
|
|
69
70
|
const MAX_CANCEL_WRITE_TIMEOUT_MS = 3 * constants_1.Time.seconds.toMilliseconds;
|
|
70
71
|
let ScalingService = class ScalingService {
|
|
71
|
-
constructor(logger, errorReporter, activeExecutions, jobProcessor, globalConfig, executionRepository, executionPersistence, instanceSettings, eventService, webhookResponseRelay, executionCrashService) {
|
|
72
|
+
constructor(logger, errorReporter, activeExecutions, jobProcessor, globalConfig, executionRepository, executionPersistence, instanceSettings, eventService, webhookResponseRelay, executionCrashService, jobOutcomeTracker) {
|
|
72
73
|
this.logger = logger;
|
|
73
74
|
this.errorReporter = errorReporter;
|
|
74
75
|
this.activeExecutions = activeExecutions;
|
|
@@ -80,9 +81,9 @@ let ScalingService = class ScalingService {
|
|
|
80
81
|
this.eventService = eventService;
|
|
81
82
|
this.webhookResponseRelay = webhookResponseRelay;
|
|
82
83
|
this.executionCrashService = executionCrashService;
|
|
84
|
+
this.jobOutcomeTracker = jobOutcomeTracker;
|
|
83
85
|
this.queueByName = new Map();
|
|
84
86
|
this.initialQueueName = queue_name_1.DEFAULT_QUEUE_NAME;
|
|
85
|
-
this.jobResults = new Map();
|
|
86
87
|
this.jobCounters = { completed: 0, failed: 0 };
|
|
87
88
|
this.queueRecoveryContext = {
|
|
88
89
|
batchSize: this.globalConfig.executions.queueRecovery.batchSize,
|
|
@@ -115,6 +116,9 @@ let ScalingService = class ScalingService {
|
|
|
115
116
|
const { default: BullQueue } = await import('bull');
|
|
116
117
|
const { RedisClientService } = await import('../services/redis-client.service.js');
|
|
117
118
|
const service = di_1.Container.get(RedisClientService);
|
|
119
|
+
service.on('connection-recovered', () => {
|
|
120
|
+
void this.jobOutcomeTracker.recheckAll();
|
|
121
|
+
});
|
|
118
122
|
const bullPrefix = this.globalConfig.queue.bull.prefix;
|
|
119
123
|
const prefix = service.toValidPrefix(bullPrefix);
|
|
120
124
|
const settings = { ...this.globalConfig.queue.bull.settings, maxStalledCount: 0 };
|
|
@@ -267,9 +271,10 @@ let ScalingService = class ScalingService {
|
|
|
267
271
|
await this.defaultQueue.client.ping();
|
|
268
272
|
}
|
|
269
273
|
popJobResult(executionId) {
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
274
|
+
return this.jobOutcomeTracker.popResult(executionId);
|
|
275
|
+
}
|
|
276
|
+
async waitForJob(job) {
|
|
277
|
+
await this.jobOutcomeTracker.waitFor(job);
|
|
273
278
|
}
|
|
274
279
|
async getPendingJobCounts() {
|
|
275
280
|
let active = 0;
|
|
@@ -324,6 +329,7 @@ let ScalingService = class ScalingService {
|
|
|
324
329
|
}
|
|
325
330
|
async stopJob(job) {
|
|
326
331
|
const props = { jobId: job.id, executionId: job.data.executionId };
|
|
332
|
+
this.jobOutcomeTracker.drop(job.data.executionId);
|
|
327
333
|
try {
|
|
328
334
|
if (await job.isActive()) {
|
|
329
335
|
await job.progress({ kind: 'abort-job' });
|
|
@@ -409,8 +415,8 @@ let ScalingService = class ScalingService {
|
|
|
409
415
|
statusCode: 500,
|
|
410
416
|
});
|
|
411
417
|
}
|
|
412
|
-
|
|
413
|
-
|
|
418
|
+
this.jobOutcomeTracker.recordFinished(msg.executionId, msg.version === 2
|
|
419
|
+
? {
|
|
414
420
|
success: msg.success,
|
|
415
421
|
error: msg.error,
|
|
416
422
|
status: msg.status,
|
|
@@ -420,8 +426,8 @@ let ScalingService = class ScalingService {
|
|
|
420
426
|
startedAt: new Date(msg.startedAt),
|
|
421
427
|
stoppedAt: new Date(msg.stoppedAt),
|
|
422
428
|
waitTill: msg.waitTill ? new Date(msg.waitTill) : null,
|
|
423
|
-
}
|
|
424
|
-
|
|
429
|
+
}
|
|
430
|
+
: undefined);
|
|
425
431
|
this.logger.info(`Execution ${msg.executionId} (job ${jobId}) finished`, {
|
|
426
432
|
workerId: msg.workerId,
|
|
427
433
|
executionId: msg.executionId,
|
|
@@ -439,6 +445,7 @@ let ScalingService = class ScalingService {
|
|
|
439
445
|
executionId: msg.executionId,
|
|
440
446
|
jobId,
|
|
441
447
|
});
|
|
448
|
+
this.jobOutcomeTracker.recordFailed(msg.executionId, new n8n_workflow_1.OperationalError(msg.errorMsg));
|
|
442
449
|
break;
|
|
443
450
|
case 'abort-job':
|
|
444
451
|
break;
|
|
@@ -449,6 +456,12 @@ let ScalingService = class ScalingService {
|
|
|
449
456
|
(0, utils_1.assertNever)(msg);
|
|
450
457
|
}
|
|
451
458
|
});
|
|
459
|
+
queue.on('global:failed', (jobId, failedReason) => {
|
|
460
|
+
this.jobOutcomeTracker.settleByJobKey(queue.name, jobId, new n8n_workflow_1.OperationalError(failedReason));
|
|
461
|
+
});
|
|
462
|
+
queue.on('global:completed', (jobId) => {
|
|
463
|
+
this.jobOutcomeTracker.settleByJobKey(queue.name, jobId);
|
|
464
|
+
});
|
|
452
465
|
if (this.isQueueMetricsEnabled) {
|
|
453
466
|
queue.on('global:completed', () => this.jobCounters.completed++);
|
|
454
467
|
queue.on('global:failed', () => this.jobCounters.failed++);
|
|
@@ -612,6 +625,6 @@ __decorate([
|
|
|
612
625
|
], ScalingService.prototype, "stopQueueRecovery", null);
|
|
613
626
|
exports.ScalingService = ScalingService = __decorate([
|
|
614
627
|
(0, di_1.Service)(),
|
|
615
|
-
__metadata("design:paramtypes", [backend_common_1.Logger, n8n_core_1.ErrorReporter, active_executions_1.ActiveExecutions, job_processor_1.JobProcessor, config_1.GlobalConfig, db_1.ExecutionRepository, execution_persistence_1.ExecutionPersistence, n8n_core_1.InstanceSettings, event_service_1.EventService, webhook_response_relay_1.WebhookResponseRelay, execution_crash_service_1.ExecutionCrashService])
|
|
628
|
+
__metadata("design:paramtypes", [backend_common_1.Logger, n8n_core_1.ErrorReporter, active_executions_1.ActiveExecutions, job_processor_1.JobProcessor, config_1.GlobalConfig, db_1.ExecutionRepository, execution_persistence_1.ExecutionPersistence, n8n_core_1.InstanceSettings, event_service_1.EventService, webhook_response_relay_1.WebhookResponseRelay, execution_crash_service_1.ExecutionCrashService, job_outcome_tracker_1.JobOutcomeTracker])
|
|
616
629
|
], ScalingService);
|
|
617
630
|
//# sourceMappingURL=scaling.service.js.map
|