n8n 2.42.0 → 2.42.2

package/dist/public-api/v1/openapi.yml

@@ -1566,8 +1566,7 @@ paths:
                                           - filePath
                                 settings:
                                   type: object
-                                  additionalProperties:
-                                    nullable: true
+                                  additionalProperties: {}
                                 nextVersions:
                                   type: array
                                   items:
@@ -1682,8 +1681,7 @@ paths:
                                           - filePath
                                 settings:
                                   type: object
-                                  additionalProperties:
-                                    nullable: true
+                                  additionalProperties: {}
                                 nextVersions:
                                   type: array
                                   items:
@@ -1801,8 +1799,7 @@ paths:
                                           - filePath
                                 settings:
                                   type: object
-                                  additionalProperties:
-                                    nullable: true
+                                  additionalProperties: {}
                                 nextVersions:
                                   type: array
                                   items:
@@ -1920,8 +1917,7 @@ paths:
                                           - filePath
                                 settings:
                                   type: object
-                                  additionalProperties:
-                                    nullable: true
+                                  additionalProperties: {}
                                 nextVersions:
                                   type: array
                                   items:
@@ -2036,8 +2032,7 @@ paths:
                                           - filePath
                                 settings:
                                   type: object
-                                  additionalProperties:
-                                    nullable: true
+                                  additionalProperties: {}
                                 nextVersions:
                                   type: array
                                   items:
@@ -2063,8 +2058,7 @@ paths:
                                   nodeName: Webhook
                                   nodeType: n8n-nodes-base.webhook
                   - type: array
-                    items:
-                      nullable: true
+                    items: {}
                     maxItems: 0
         '400':
           $ref: '#/components/responses/badRequest'
@@ -2167,10 +2161,7 @@ paths:
                   description: npm package name. Unscoped names start with n8n-nodes-. Scoped names use the @[author]/n8n-nodes- form.
                 version:
                   type: string
-                  description: Semver version or npm dist-tag, such as latest or beta
-                verify:
-                  type: boolean
-                  description: Whether to verify the package against the n8n-vetted package list. Required when the instance has N8N_UNVERIFIED_PACKAGES_ENABLED=false.
+                  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.
               required:
                 - name
       responses:
@@ -2214,10 +2205,7 @@ paths:
               properties:
                 version:
                   type: string
-                  description: Semver version or npm dist-tag to update to, such as latest or beta
-                verify:
-                  type: boolean
-                  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.
+                  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.
       responses:
         '200':
           description: Operation successful.
@@ -2956,8 +2944,7 @@ paths:
                   example: githubApi
                 data:
                   type: object
-                  additionalProperties:
-                    nullable: true
+                  additionalProperties: {}
                   writeOnly: true
                   example:
                     accessToken: ada612vad6fa5df4adf5a5dsf4389adsf76da7s
@@ -3073,8 +3060,7 @@ paths:
                   example: githubApi
                 data:
                   type: object
-                  additionalProperties:
-                    nullable: true
+                  additionalProperties: {}
                   description: The credential data. Required when changing credential type.
                   writeOnly: true
                   example:
@@ -3307,8 +3293,7 @@ paths:
                       - object
                   properties:
                     type: object
-                    additionalProperties:
-                      nullable: true
+                    additionalProperties: {}
                     description: JSON Schema fragment for each of the credential type's fields, keyed by field name.
                     example:
                       apiKey:
@@ -3325,8 +3310,7 @@ paths:
                       - domain
                   allOf:
                     type: array
-                    items:
-                      nullable: true
+                    items: {}
                 required:
                   - additionalProperties
                   - type
@@ -12004,12 +11988,10 @@ paths:
                           - 80
                       parameters:
                         type: object
-                        additionalProperties:
-                          nullable: true
+                        additionalProperties: {}
                       credentials:
                         type: object
-                        additionalProperties:
-                          nullable: true
+                        additionalProperties: {}
                         example:
                           jiraSoftwareCloudApi:
                             name: jiraApi
@@ -12192,17 +12174,15 @@ paths:
                     - type: string
                       format: jsonString
                     - type: object
-                      additionalProperties:
-                        nullable: true
-                    - nullable: true
+                      additionalProperties: {}
+                    - {}
                   description: Data the workflow keeps between executions
                   example:
                     lastId: 1
                 pinData:
                   type: object
                   nullable: true
-                  additionalProperties:
-                    nullable: true
+                  additionalProperties: {}
                   description: Pinned sample data for nodes, keyed by node name
                 projectId:
                   type: string
@@ -13292,12 +13272,10 @@ paths:
                           - 80
                       parameters:
                         type: object
-                        additionalProperties:
-                          nullable: true
+                        additionalProperties: {}
                       credentials:
                         type: object
-                        additionalProperties:
-                          nullable: true
+                        additionalProperties: {}
                         example:
                           jiraSoftwareCloudApi:
                             name: jiraApi
@@ -13480,17 +13458,15 @@ paths:
                     - type: string
                       format: jsonString
                     - type: object
-                      additionalProperties:
-                        nullable: true
-                    - nullable: true
+                      additionalProperties: {}
+                    - {}
                   description: Data the workflow keeps between executions
                   example:
                     lastId: 1
                 pinData:
                   type: object
                   nullable: true
-                  additionalProperties:
-                    nullable: true
+                  additionalProperties: {}
                   description: Pinned sample data for nodes, keyed by node name
                 parentFolderId:
                   type: string
@@ -16098,6 +16074,7 @@ components:
         - authnRequestsSigned
         - wantAssertionsSigned
         - wantMessageSigned
+        - emailVerifiedRequired
         - signingPrivateKey
         - signingCertificate
         - acsBinding
@@ -16123,6 +16100,7 @@ components:
             - firstName
             - lastName
             - userPrincipalName
+            - emailVerified
             - n8nInstanceRole
             - n8nProjectRoles
           properties:
@@ -16138,6 +16116,10 @@ components:
             userPrincipalName:
               type: string
               description: SAML attribute mapped to the user's principal name.
+            emailVerified:
+              type: string
+              description: |
+                SAML attribute that states whether the identity provider verified the user's email. An empty string when unused.
             n8nInstanceRole:
               type: string
               description: SAML attribute mapped to the n8n instance role.
@@ -16185,6 +16167,11 @@ components:
           type: boolean
           description: Whether signed SAML messages are required.
           example: true
+        emailVerifiedRequired:
+          type: boolean
+          description: |
+            Whether the identity provider must assert that the user's email address is verified before a login is linked to an existing user by email. When disabled, only an explicit negative assertion is rejected.
+          example: false
         signingPrivateKey:
           type: string
           description: |
@@ -16251,6 +16238,7 @@ components:
         - authnRequestsSigned
         - wantAssertionsSigned
         - wantMessageSigned
+        - emailVerifiedRequired
         - signingPrivateKey
         - signingCertificate
         - acsBinding
@@ -16266,6 +16254,7 @@ components:
             - firstName
             - lastName
             - userPrincipalName
+            - emailVerified
             - n8nInstanceRole
             - n8nProjectRoles
           properties:
@@ -16281,6 +16270,10 @@ components:
             userPrincipalName:
               type: string
               description: SAML attribute mapped to the user's principal name.
+            emailVerified:
+              type: string
+              description: |
+                SAML attribute that states whether the identity provider verified the user's email. Accepted values are `true` and `false`, case-insensitive. Use an empty string when unused.
             n8nInstanceRole:
               type: string
               description: SAML attribute mapped to the n8n instance role. Use an empty string when unused.
@@ -16329,6 +16322,11 @@ components:
           type: boolean
           description: Whether signed SAML messages are required.
           example: true
+        emailVerifiedRequired:
+          type: boolean
+          description: |
+            Whether the identity provider must assert that the user's email address is verified before a login is linked to an existing user by email. When disabled, only an explicit negative assertion is rejected.
+          example: false
         signingPrivateKey:
           type: string
           description: |
@@ -18411,8 +18409,7 @@ components:
           type: string
         nodes:
           type: array
-          items:
-            nullable: true
+          items: {}
         createdAt:
           type: string
         description:

package/dist/requests.d.ts

@@ -162,16 +162,9 @@ export declare namespace AnnotationTagsRequest {
 }
 export declare namespace NodeRequest {
     type GetAll = AuthenticatedRequest;
-    type Post = AuthenticatedRequest<{}, {}, {
-        name?: string;
-        verify?: boolean;
-        version?: string;
-        checksum?: string;
-    }>;
     type Delete = AuthenticatedRequest<{}, {}, {}, {
         name: string;
     }>;
-    type Update = Post;
 }
 export declare namespace LicenseRequest {
     type Activate = AuthenticatedRequest<{}, {}, {

package/dist/scaling/constants.d.ts

@@ -7,3 +7,4 @@ export declare const SUBSCRIBER_LIVENESS_TIMEOUT_MS: number;
 export declare const MAX_PUBSUB_PAYLOAD_BYTES: number;
 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">;
 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">;
+export declare const JOB_WAIT_RECHECK_INTERVAL_MS: number;

package/dist/scaling/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+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;
 const constants_1 = require("@n8n/constants");
 exports.JOB_TYPE_NAME = 'job';
 exports.COMMAND_PUBSUB_CHANNEL = 'n8n.commands';
@@ -42,4 +42,5 @@ exports.IMMEDIATE_COMMANDS = new Set([
     'display-workflow-publication-status',
     'workflow-publish-wake-up',
 ]);
+exports.JOB_WAIT_RECHECK_INTERVAL_MS = 60 * constants_1.Time.seconds.toMilliseconds;
 //# sourceMappingURL=constants.js.map

package/dist/scaling/constants.js.map

@@ -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"}
+{"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"}

package/dist/scaling/job-outcome-tracker.d.ts

@@ -0,0 +1,37 @@
+import { Logger } from '@n8n/backend-common';
+import { ExecutionRepository } from '@n8n/db';
+import { ActiveExecutions } from '../active-executions';
+import { EventService } from '../events/event.service';
+import type { Job, JobFinishedProps, JobId } from './scaling.types';
+type PendingJobWait = {
+    jobKey: string;
+    resolve: () => void;
+    reject: (error: Error) => void;
+};
+export declare class JobOutcomeTracker {
+    private readonly logger;
+    private readonly activeExecutions;
+    private readonly executionRepository;
+    private readonly eventService;
+    private readonly results;
+    private readonly failures;
+    private readonly pendingWaits;
+    private readonly executionIdByJobKey;
+    private recheckTimer?;
+    private recheckInFlight?;
+    constructor(logger: Logger, activeExecutions: ActiveExecutions, executionRepository: ExecutionRepository, eventService: EventService);
+    recordFinished(executionId: string, result?: JobFinishedProps): void;
+    recordFailed(executionId: string, error: Error): void;
+    settleByJobKey(queueName: string, jobId: JobId, error?: Error): void;
+    waitFor(job: Job): Promise<void>;
+    popResult(executionId: string): JobFinishedProps | undefined;
+    drop(executionId: string): PendingJobWait | undefined;
+    clear(): void;
+    recheckAll(): Promise<void>;
+    private recheckPendingWaits;
+    private readStatuses;
+    private settle;
+    private startRecheckTimer;
+    private stopRecheckTimer;
+}
+export {};

package/dist/scaling/job-outcome-tracker.js

@@ -0,0 +1,162 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JobOutcomeTracker = void 0;
+const backend_common_1 = require("@n8n/backend-common");
+const db_1 = require("@n8n/db");
+const di_1 = require("@n8n/di");
+const active_executions_1 = require("../active-executions");
+const event_service_1 = require("../events/event.service");
+const constants_1 = require("./constants");
+const toJobKey = (queueName, jobId) => `${queueName}:${jobId.toString()}`;
+const IN_FLIGHT_STATUSES = new Set(['new', 'running', 'unknown']);
+const SUCCEEDED_STATUSES = new Set(['success', 'waiting', 'deleted']);
+const FAILED_RESPONSE = {
+    body: { message: 'Workflow execution failed' },
+    statusCode: 500,
+};
+let JobOutcomeTracker = class JobOutcomeTracker {
+    constructor(logger, activeExecutions, executionRepository, eventService) {
+        this.logger = logger;
+        this.activeExecutions = activeExecutions;
+        this.executionRepository = executionRepository;
+        this.eventService = eventService;
+        this.results = new Map();
+        this.failures = new Map();
+        this.pendingWaits = new Map();
+        this.executionIdByJobKey = new Map();
+        this.logger = this.logger.scoped('scaling');
+    }
+    recordFinished(executionId, result) {
+        if (result && this.activeExecutions.has(executionId)) {
+            this.results.set(executionId, result);
+        }
+        this.settle(executionId, { succeeded: result?.success ?? true });
+    }
+    recordFailed(executionId, error) {
+        const settled = this.settle(executionId, { error, succeeded: false });
+        if (settled)
+            return;
+        if (this.activeExecutions.has(executionId))
+            this.failures.set(executionId, error);
+    }
+    settleByJobKey(queueName, jobId, error) {
+        const executionId = this.executionIdByJobKey.get(toJobKey(queueName, jobId));
+        if (!executionId)
+            return;
+        this.settle(executionId, { error, succeeded: !error });
+    }
+    async waitFor(job) {
+        const { executionId } = job.data;
+        if (this.results.has(executionId))
+            return;
+        const earlyFailure = this.failures.get(executionId);
+        if (earlyFailure) {
+            this.failures.delete(executionId);
+            throw earlyFailure;
+        }
+        await new Promise((resolve, reject) => {
+            const jobKey = toJobKey(job.queue.name, job.id);
+            this.pendingWaits.set(executionId, { jobKey, resolve, reject });
+            this.executionIdByJobKey.set(jobKey, executionId);
+            this.startRecheckTimer();
+        });
+    }
+    popResult(executionId) {
+        const result = this.results.get(executionId);
+        this.results.delete(executionId);
+        this.failures.delete(executionId);
+        return result;
+    }
+    drop(executionId) {
+        const wait = this.pendingWaits.get(executionId);
+        if (!wait)
+            return undefined;
+        this.pendingWaits.delete(executionId);
+        this.executionIdByJobKey.delete(wait.jobKey);
+        if (this.pendingWaits.size === 0)
+            this.stopRecheckTimer();
+        return wait;
+    }
+    clear() {
+        for (const executionId of this.pendingWaits.keys())
+            this.drop(executionId);
+    }
+    async recheckAll() {
+        if (this.pendingWaits.size === 0)
+            return;
+        this.recheckInFlight ??= this.recheckPendingWaits().finally(() => {
+            this.recheckInFlight = undefined;
+        });
+        await this.recheckInFlight;
+    }
+    async recheckPendingWaits() {
+        const statusById = await this.readStatuses([...this.pendingWaits.keys()]);
+        if (!statusById)
+            return;
+        for (const [executionId, status] of statusById) {
+            if (IN_FLIGHT_STATUSES.has(status))
+                continue;
+            if (!this.pendingWaits.has(executionId))
+                continue;
+            this.logger.warn(`Execution ${executionId} ended without a completion event, resolving the wait from the DB`, { executionId, status });
+            this.eventService.emit('job-completion-missed', { status });
+            this.settle(executionId, { succeeded: SUCCEEDED_STATUSES.has(status) });
+        }
+    }
+    async readStatuses(executionIds) {
+        try {
+            const rows = await this.executionRepository.findStatusesByIds(executionIds);
+            const statusById = new Map(rows.map((row) => [row.id, row.status]));
+            for (const executionId of executionIds) {
+                if (!statusById.has(executionId))
+                    statusById.set(executionId, 'deleted');
+            }
+            return statusById;
+        }
+        catch (error) {
+            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 });
+            return undefined;
+        }
+    }
+    settle(executionId, outcome) {
+        const wait = this.drop(executionId);
+        if (!wait)
+            return false;
+        this.activeExecutions.resolveResponsePromise(executionId, outcome.succeeded ? {} : FAILED_RESPONSE);
+        if (outcome.error) {
+            wait.reject(outcome.error);
+        }
+        else {
+            wait.resolve();
+        }
+        return true;
+    }
+    startRecheckTimer() {
+        if (this.recheckTimer)
+            return;
+        this.recheckTimer = setInterval(() => {
+            void this.recheckAll();
+        }, constants_1.JOB_WAIT_RECHECK_INTERVAL_MS).unref();
+    }
+    stopRecheckTimer() {
+        if (!this.recheckTimer)
+            return;
+        clearInterval(this.recheckTimer);
+        this.recheckTimer = undefined;
+    }
+};
+exports.JobOutcomeTracker = JobOutcomeTracker;
+exports.JobOutcomeTracker = JobOutcomeTracker = __decorate([
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [backend_common_1.Logger, active_executions_1.ActiveExecutions, db_1.ExecutionRepository, event_service_1.EventService])
+], JobOutcomeTracker);
+//# sourceMappingURL=job-outcome-tracker.js.map

package/dist/scaling/job-outcome-tracker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"job-outcome-tracker.js","sourceRoot":"","sources":["../../src/scaling/job-outcome-tracker.ts"],"names":[],"mappings":"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"}

package/dist/scaling/scaling.service.d.ts

@@ -6,6 +6,7 @@ import { ActiveExecutions } from '../active-executions';
 import { EventService } from '../events/event.service';
 import { ExecutionCrashService } from '../executions/execution-crash.service';
 import { ExecutionPersistence } from '../executions/execution-persistence';
+import { JobOutcomeTracker } from './job-outcome-tracker';
 import { JobProcessor } from './job-processor';
 import type { JobQueue, Job, JobData, JobStatus, JobId, JobFinishedProps } from './scaling.types';
 import { WebhookResponseRelay } from './webhook-response-relay';
@@ -21,11 +22,11 @@ export declare class ScalingService {
     private readonly eventService;
     private readonly webhookResponseRelay;
     private readonly executionCrashService;
+    private readonly jobOutcomeTracker;
     private readonly queueByName;
     private initialQueueName;
     private createBullQueue?;
-    private jobResults;
-    constructor(logger: Logger, errorReporter: ErrorReporter, activeExecutions: ActiveExecutions, jobProcessor: JobProcessor, globalConfig: GlobalConfig, executionRepository: ExecutionRepository, executionPersistence: ExecutionPersistence, instanceSettings: InstanceSettings, eventService: EventService, webhookResponseRelay: WebhookResponseRelay, executionCrashService: ExecutionCrashService);
+    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);
     private get defaultQueue();
     getOrCreateQueue(queueName: string): Promise<JobQueue>;
     setupQueue(): Promise<void>;
@@ -38,6 +39,7 @@ export declare class ScalingService {
     private logExecutionsToDrain;
     pingQueue(): Promise<void>;
     popJobResult(executionId: string): JobFinishedProps | undefined;
+    waitForJob(job: Job): Promise<void>;
     getPendingJobCounts(): Promise<{
         active: number;
         waiting: number;