n8n 1.110.1 → 1.112.0

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

@@ -198,7 +198,9 @@ paths:
           schema:
             type: string
             enum:
+              - canceled
               - error
+              - running
               - success
               - waiting
         - name: workflowId
@@ -271,6 +273,39 @@ paths:
           $ref: '#/components/responses/unauthorized'
         '404':
           $ref: '#/components/responses/notFound'
+  /executions/{id}/retry:
+    post:
+      x-eov-operation-id: retryExecution
+      x-eov-operation-handler: v1/handlers/executions/executions.handler
+      tags:
+        - Execution
+      summary: Retry an execution
+      description: Retry an execution from your instance.
+      parameters:
+        - $ref: '#/components/parameters/executionId'
+      requestBody:
+        required: false
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                loadWorkflow:
+                  type: boolean
+                  description: Whether to load the currently saved workflow to execute instead of the one saved at the time of the execution. If set to true, it will retry with the latest version of the workflow.
+      responses:
+        '200':
+          description: Operation successful.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/execution'
+        '401':
+          $ref: '#/components/responses/unauthorized'
+        '404':
+          $ref: '#/components/responses/notFound'
+        '409':
+          $ref: '#/components/responses/conflict'
   /tags:
     post:
       x-eov-operation-id: createTag
@@ -948,6 +983,8 @@ paths:
         - Variables
       summary: Update a variable
       description: Update a variable from your instance.
+      parameters:
+        - $ref: '#/components/parameters/variableId'
       requestBody:
         description: Payload for variable to update.
         content:
@@ -1356,6 +1393,8 @@ components:
         stoppedAt:
           type: string
           format: date-time
+          nullable: true
+          description: The time at which the execution stopped. Will only be null for executions that still have the status 'running'.
         workflowId:
           type: number
           example: '1000'
@@ -1365,6 +1404,17 @@ components:
           format: date-time
         customData:
           type: object
+        status:
+          type: string
+          enum:
+            - canceled
+            - crashed
+            - error
+            - new
+            - running
+            - success
+            - unknown
+            - waiting
     executionList:
       type: object
       properties:
@@ -1430,7 +1480,7 @@ components:
           type: string
         type:
           type: string
-          example: n8n-nodes-base.Jira
+          example: n8n-nodes-base.jira
         typeVersion:
           type: number
           example: 1
@@ -1578,10 +1628,11 @@ components:
         connections:
           type: object
           example:
-            main:
-              - node: Jira
-                type: main
-                index: 0
+            Jira:
+              main:
+                - - node: Jira
+                    type: main
+                    index: 0
         settings:
           $ref: '#/components/schemas/workflowSettings'
         staticData:
@@ -1899,10 +1950,10 @@ components:
       description: Unauthorized
     notFound:
       description: The specified resource was not found.
-    badRequest:
-      description: The request is invalid or provides malformed data.
     conflict:
       description: Conflict
+    badRequest:
+      description: The request is invalid or provides malformed data.
     forbidden:
       description: Forbidden
     NotFound:
@@ -2009,6 +2060,8 @@ components:
       $ref: '#/components/parameters/userIdentifier'
     IncludeRole:
       $ref: '#/components/parameters/includeRole'
+    VariableId:
+      $ref: '#/components/parameters/variableId'
   securitySchemes:
     ApiKeyAuth:
       type: apiKey

package/dist/push/abstract.push.d.ts

@@ -13,7 +13,7 @@ export declare abstract class AbstractPush<Connection> extends TypedEmitter<Abst
     protected connections: Record<string, Connection>;
     protected userIdByPushRef: Record<string, string>;
     protected abstract close(connection: Connection): void;
-    protected abstract sendToOneConnection(connection: Connection, data: string): void;
+    protected abstract sendToOneConnection(connection: Connection, data: string, isBinary: boolean): void;
     protected abstract ping(connection: Connection): void;
     constructor(logger: Logger, errorReporter: ErrorReporter);
     protected add(pushRef: string, userId: User['id'], connection: Connection): void;
@@ -22,7 +22,7 @@ export declare abstract class AbstractPush<Connection> extends TypedEmitter<Abst
     private sendTo;
     private pingAll;
     sendToAll(pushMsg: PushMessage): void;
-    sendToOne(pushMsg: PushMessage, pushRef: string): void;
+    sendToOne(pushMsg: PushMessage, pushRef: string, asBinary?: boolean): void;
     sendToUsers(pushMsg: PushMessage, userIds: Array<User['id']>): void;
     closeAllConnections(): void;
     hasPushRef(pushRef: string): boolean;

package/dist/push/abstract.push.js

@@ -46,7 +46,7 @@ let AbstractPush = class AbstractPush extends typed_emitter_1.TypedEmitter {
         delete this.connections[pushRef];
         delete this.userIdByPushRef[pushRef];
     }
-    sendTo({ type, data }, pushRefs) {
+    sendTo({ type, data }, pushRefs, asBinary = false) {
         this.logger.debug(`Pushed to frontend: ${type}`, {
             dataType: type,
             pushRefs: pushRefs.join(', '),
@@ -55,7 +55,7 @@ let AbstractPush = class AbstractPush extends typed_emitter_1.TypedEmitter {
         for (const pushRef of pushRefs) {
             const connection = this.connections[pushRef];
             (0, n8n_workflow_1.assert)(connection);
-            this.sendToOneConnection(connection, stringifiedPayload);
+            this.sendToOneConnection(connection, stringifiedPayload, asBinary);
         }
     }
     pingAll() {
@@ -66,12 +66,12 @@ let AbstractPush = class AbstractPush extends typed_emitter_1.TypedEmitter {
     sendToAll(pushMsg) {
         this.sendTo(pushMsg, Object.keys(this.connections));
     }
-    sendToOne(pushMsg, pushRef) {
+    sendToOne(pushMsg, pushRef, asBinary = false) {
         if (this.connections[pushRef] === undefined) {
             this.logger.debug(`The session "${pushRef}" is not registered.`, { pushRef });
             return;
         }
-        this.sendTo(pushMsg, [pushRef]);
+        this.sendTo(pushMsg, [pushRef], asBinary);
     }
     sendToUsers(pushMsg, userIds) {
         const { connections } = this;

package/dist/push/abstract.push.js.map

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

package/dist/push/index.d.ts

@@ -31,11 +31,12 @@ export declare class Push extends TypedEmitter<PushEvents> {
     handleRequest(req: SSEPushRequest | WebSocketPushRequest, res: PushResponse): void;
     broadcast(pushMsg: PushMessage): void;
     hasPushRef(pushRef: string): boolean;
-    send(pushMsg: PushMessage, pushRef: string): void;
+    send(pushMsg: PushMessage, pushRef: string, asBinary?: boolean): void;
     sendToUsers(pushMsg: PushMessage, userIds: Array<User['id']>): void;
     onShutdown(): void;
     private shouldRelayViaPubSub;
-    handleRelayExecutionLifecycleEvent({ pushRef, ...pushMsg }: PushMessage & {
+    handleRelayExecutionLifecycleEvent({ pushRef, asBinary, ...pushMsg }: PushMessage & {
+        asBinary: boolean;
         pushRef: string;
     }): void;
     private relayViaPubSub;

package/dist/push/index.js

@@ -23,10 +23,10 @@ const n8n_workflow_1 = require("n8n-workflow");
 const url_1 = require("url");
 const ws_1 = require("ws");
 const auth_service_1 = require("../auth/auth.service");
-const constants_1 = require("../constants");
 const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
 const publisher_service_1 = require("../scaling/pubsub/publisher.service");
 const typed_emitter_1 = require("../typed-emitter");
+const origin_validator_1 = require("./origin-validator");
 const push_config_1 = require("./push.config");
 const sse_push_1 = require("./sse.push");
 const websocket_push_1 = require("./websocket.push");
@@ -74,20 +74,24 @@ let Push = class Push extends typed_emitter_1.TypedEmitter {
     handleRequest(req, res) {
         const { ws, query: { pushRef }, user, headers, } = req;
         let connectionError = '';
-        const originHost = headers.origin?.replace(/^https?:\/\//, '');
         if (!pushRef) {
             connectionError = 'The query parameter "pushRef" is missing!';
         }
-        else if (!originHost) {
-            this.logger.warn('Origin header is missing');
-            connectionError = 'Invalid origin!';
-        }
         else if (backend_common_1.inProduction) {
-            const expectedHost = typeof headers['x-forwarded-host'] === 'string'
-                ? headers['x-forwarded-host']
-                : headers.host;
-            if (expectedHost !== originHost) {
-                this.logger.warn(`Origin header does NOT match the expected origin. (Origin: "${originHost}", Expected: "${expectedHost}")`, { headers: (0, pick_1.default)(headers, ['host', 'origin', 'x-forwarded-proto', 'x-forwarded-host']) });
+            const validation = (0, origin_validator_1.validateOriginHeaders)(headers);
+            if (!validation.isValid) {
+                this.logger.warn('Origin header does NOT match the expected origin. ' +
+                    `(Origin: "${headers.origin}" -> "${validation.originInfo?.host || 'N/A'}", ` +
+                    `Expected: "${validation.rawExpectedHost}" -> "${validation.expectedHost}", ` +
+                    `Protocol: "${validation.expectedProtocol}")`, {
+                    headers: (0, pick_1.default)(headers, [
+                        'host',
+                        'origin',
+                        'x-forwarded-proto',
+                        'x-forwarded-host',
+                        'forwarded',
+                    ]),
+                });
                 connectionError = 'Invalid origin!';
             }
         }
@@ -117,12 +121,12 @@ let Push = class Push extends typed_emitter_1.TypedEmitter {
     hasPushRef(pushRef) {
         return this.backend.hasPushRef(pushRef);
     }
-    send(pushMsg, pushRef) {
+    send(pushMsg, pushRef, asBinary = false) {
         if (this.shouldRelayViaPubSub(pushRef)) {
-            this.relayViaPubSub(pushMsg, pushRef);
+            this.relayViaPubSub(pushMsg, pushRef, asBinary);
             return;
         }
-        this.backend.sendToOne(pushMsg, pushRef);
+        this.backend.sendToOne(pushMsg, pushRef, asBinary);
     }
     sendToUsers(pushMsg, userIds) {
         this.backend.sendToUsers(pushMsg, userIds);
@@ -134,36 +138,36 @@ let Push = class Push extends typed_emitter_1.TypedEmitter {
         const { isWorker, isMultiMain } = this.instanceSettings;
         return isWorker || (isMultiMain && !this.hasPushRef(pushRef));
     }
-    handleRelayExecutionLifecycleEvent({ pushRef, ...pushMsg }) {
+    handleRelayExecutionLifecycleEvent({ pushRef, asBinary, ...pushMsg }) {
         if (!this.hasPushRef(pushRef))
             return;
-        this.send(pushMsg, pushRef);
+        this.send(pushMsg, pushRef, asBinary);
     }
-    relayViaPubSub(pushMsg, pushRef) {
+    relayViaPubSub(pushMsg, pushRef, asBinary = false) {
         const eventSizeBytes = new TextEncoder().encode(JSON.stringify(pushMsg.data)).length;
         if (eventSizeBytes <= MAX_PAYLOAD_SIZE_BYTES) {
             void this.publisher.publishCommand({
                 command: 'relay-execution-lifecycle-event',
-                payload: { ...pushMsg, pushRef },
+                payload: { ...pushMsg, pushRef, asBinary },
             });
             return;
         }
-        const pushMsgCopy = (0, n8n_workflow_1.deepCopy)(pushMsg);
+        const { type } = pushMsg;
         const toMb = (bytes) => (bytes / (1024 * 1024)).toFixed(0);
         const eventMb = toMb(eventSizeBytes);
         const maxMb = toMb(MAX_PAYLOAD_SIZE_BYTES);
-        const { type } = pushMsgCopy;
-        this.logger.warn(`Size of "${type}" (${eventMb} MB) exceeds max size ${maxMb} MB. Trimming...`);
-        if (type === 'nodeExecuteAfter') {
-            pushMsgCopy.data.itemCount = pushMsgCopy.data.data.data?.main[0]?.length ?? 1;
-            pushMsgCopy.data.data.data = constants_1.TRIMMED_TASK_DATA_CONNECTIONS;
+        if (type === 'nodeExecuteAfterData') {
+            this.logger.warn(`Size of "${type}" (${eventMb} MB) exceeds max size ${maxMb} MB. Skipping...`);
+            return;
         }
-        else if (type === 'executionFinished') {
+        this.logger.warn(`Size of "${type}" (${eventMb} MB) exceeds max size ${maxMb} MB. Trimming...`);
+        const pushMsgCopy = (0, n8n_workflow_1.deepCopy)(pushMsg);
+        if (pushMsgCopy.type === 'executionFinished') {
             pushMsgCopy.data.rawData = '';
         }
         void this.publisher.publishCommand({
             command: 'relay-execution-lifecycle-event',
-            payload: { ...pushMsgCopy, pushRef },
+            payload: { ...pushMsgCopy, pushRef, asBinary },
         });
     }
 };

package/dist/push/index.js.map

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

package/dist/push/origin-validator.d.ts

@@ -0,0 +1,13 @@
+import type { Request } from 'express';
+export interface OriginValidationResult {
+    isValid: boolean;
+    originInfo?: {
+        protocol: 'http' | 'https';
+        host: string;
+    };
+    expectedHost?: string;
+    expectedProtocol?: 'http' | 'https';
+    rawExpectedHost?: string;
+    error?: string;
+}
+export declare function validateOriginHeaders(headers: Request['headers']): OriginValidationResult;

package/dist/push/origin-validator.js

@@ -0,0 +1,145 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateOriginHeaders = validateOriginHeaders;
+function validateOriginHeaders(headers) {
+    const originInfo = parseOrigin(headers.origin ?? '');
+    if (!originInfo) {
+        return {
+            isValid: false,
+            error: 'Origin header is missing or malformed',
+        };
+    }
+    let rawExpectedHost;
+    let expectedProtocol = originInfo.protocol;
+    const forwarded = parseForwardedHeader(headers.forwarded ?? '');
+    if (forwarded?.host) {
+        rawExpectedHost = forwarded.host;
+        if (forwarded.proto) {
+            const validatedProto = validateProtocol(forwarded.proto);
+            if (validatedProto) {
+                expectedProtocol = validatedProto;
+            }
+        }
+    }
+    else {
+        const xForwardedHost = getFirstHeaderValue(headers['x-forwarded-host']);
+        if (xForwardedHost) {
+            rawExpectedHost = xForwardedHost;
+            const xForwardedProto = getFirstHeaderValue(headers['x-forwarded-proto']);
+            if (xForwardedProto) {
+                const validatedProto = validateProtocol(xForwardedProto.split(',')[0]?.trim());
+                if (validatedProto) {
+                    expectedProtocol = validatedProto;
+                }
+            }
+        }
+        else {
+            rawExpectedHost = headers.host;
+        }
+    }
+    const normalizedExpectedHost = normalizeHost(rawExpectedHost ?? '', expectedProtocol);
+    const isValid = normalizedExpectedHost === originInfo.host;
+    return {
+        isValid,
+        originInfo,
+        expectedHost: normalizedExpectedHost,
+        expectedProtocol,
+        rawExpectedHost,
+        error: isValid ? undefined : 'Origin header does not match expected host',
+    };
+}
+function normalizeHost(host, protocol) {
+    if (!host)
+        return host;
+    try {
+        const url = new URL(`${protocol}://${host}`);
+        const defaultPort = protocol === 'https' ? '443' : '80';
+        const actualPort = url.port || defaultPort;
+        if (actualPort === defaultPort) {
+            return stripIPv6Brackets(url.hostname);
+        }
+        return stripIPv6Brackets(url.host);
+    }
+    catch {
+        return host;
+    }
+}
+function stripIPv6Brackets(hostname) {
+    if (hostname.startsWith('[') && hostname.includes(']:')) {
+        const closingBracket = hostname.indexOf(']:');
+        const ipv6 = hostname.slice(1, closingBracket);
+        const port = hostname.slice(closingBracket + 2);
+        return `${ipv6}:${port}`;
+    }
+    if (hostname.startsWith('[') && hostname.endsWith(']')) {
+        return hostname.slice(1, -1);
+    }
+    return hostname;
+}
+function getFirstHeaderValue(header) {
+    if (!header)
+        return undefined;
+    if (typeof header === 'string')
+        return header;
+    return header[0];
+}
+function validateProtocol(proto) {
+    if (!proto)
+        return undefined;
+    const normalized = proto.toLowerCase().trim();
+    return normalized === 'http' || normalized === 'https' ? normalized : undefined;
+}
+function parseForwardedHeader(forwardedHeader) {
+    if (!forwardedHeader || typeof forwardedHeader !== 'string') {
+        return null;
+    }
+    try {
+        const firstEntry = forwardedHeader.split(',')[0]?.trim();
+        if (!firstEntry)
+            return null;
+        const result = {};
+        const pairs = firstEntry.split(';');
+        for (const pair of pairs) {
+            const [key, value] = pair.split('=', 2);
+            if (!key || !value)
+                continue;
+            const cleanKey = key.trim().toLowerCase();
+            const cleanValue = value.trim().replace(/^["']|["']$/g, '');
+            if (cleanKey === 'host') {
+                result.host = cleanValue;
+            }
+            else if (cleanKey === 'proto') {
+                result.proto = cleanValue;
+            }
+        }
+        return result;
+    }
+    catch {
+        return null;
+    }
+}
+function parseOrigin(origin) {
+    if (!origin || typeof origin !== 'string') {
+        return null;
+    }
+    try {
+        const url = new URL(origin);
+        const protocol = url.protocol.toLowerCase();
+        if (protocol !== 'http:' && protocol !== 'https:') {
+            return null;
+        }
+        const protocolName = protocol === 'https:' ? 'https' : 'http';
+        const defaultPort = protocolName === 'https' ? '443' : '80';
+        const actualPort = url.port || defaultPort;
+        const rawHost = actualPort === defaultPort ? url.hostname : url.host;
+        const normalizedHost = stripIPv6Brackets(rawHost);
+        return {
+            protocol: protocolName,
+            host: normalizedHost,
+        };
+    }
+    catch {
+        return null;
+    }
+}
+//# sourceMappingURL=origin-validator.js.map

package/dist/push/origin-validator.js.map

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

package/dist/push/websocket.push.d.ts

@@ -4,7 +4,7 @@ import { AbstractPush } from './abstract.push';
 export declare class WebSocketPush extends AbstractPush<WebSocket> {
     add(pushRef: string, userId: User['id'], connection: WebSocket): void;
     protected close(connection: WebSocket): void;
-    protected sendToOneConnection(connection: WebSocket, data: string): void;
+    protected sendToOneConnection(connection: WebSocket, data: string, asBinary: boolean): void;
     protected ping(connection: WebSocket): void;
     private isClientHeartbeat;
 }

package/dist/push/websocket.push.js

@@ -57,8 +57,8 @@ let WebSocketPush = class WebSocketPush extends abstract_push_1.AbstractPush {
     close(connection) {
         connection.close();
     }
-    sendToOneConnection(connection, data) {
-        connection.send(data);
+    sendToOneConnection(connection, data, asBinary) {
+        connection.send(data, { binary: asBinary });
     }
     ping(connection) {
         if (!connection.isAlive) {

package/dist/push/websocket.push.js.map

@@ -1 +1 @@
-{"version":3,"file":"websocket.push.js","sourceRoot":"","sources":["../../src/push/websocket.push.ts"],"names":[],"mappings":";;;;;;;;;AAAA,8CAAwD;AAExD,gCAAkC;AAClC,+CAA+C;AAG/C,mDAA+C;AAE/C,SAAS,SAAS;IACjB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;AACrB,CAAC;AAGM,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,4BAAuB;IACzD,GAAG,CAAC,OAAe,EAAE,MAAkB,EAAE,UAAqB;QAC7D,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;QAC1B,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAEjC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;QAEvC,MAAM,SAAS,GAAG,KAAK,EAAE,IAAuB,EAAE,EAAE;YACnD,IAAI,CAAC;gBACJ,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;oBACjC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;oBACrB,CAAC,CAAC,IAAI,YAAY,WAAW;wBAC5B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;wBACnB,CAAC,CAAC,IAAI,CAAC;gBAET,MAAM,GAAG,GAAY,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;gBAKzD,IAAI,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;oBACvC,OAAO;gBACR,CAAC;gBAED,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YACtC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,aAAa,CAAC,KAAK,CACvB,IAAI,8BAAe,CAAC,4BAA4B,EAAE;oBACjD,KAAK,EAAE;wBACN,MAAM;wBACN,IAAI;qBACJ;oBACD,KAAK,EAAE,KAAK;iBACZ,CAAC,CACF,CAAC;gBACF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,EAAE;oBAC1D,KAAK,EAAE,KAAgB;oBACvB,OAAO;oBACP,IAAI;iBACJ,CAAC,CAAC;YACJ,CAAC;QACF,CAAC,CAAC;QAGF,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;YAC7B,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YAClC,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YACrC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACrC,CAAC;IAES,KAAK,CAAC,UAAqB;QACpC,UAAU,CAAC,KAAK,EAAE,CAAC;IACpB,CAAC;IAES,mBAAmB,CAAC,UAAqB,EAAE,IAAY;QAChE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IAES,IAAI,CAAC,UAAqB;QAEnC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YACzB,OAAO,UAAU,CAAC,SAAS,EAAE,CAAC;QAC/B,CAAC;QACD,UAAU,CAAC,OAAO,GAAG,KAAK,CAAC;QAC3B,UAAU,CAAC,IAAI,EAAE,CAAC;IACnB,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,GAAY;QAC3C,MAAM,MAAM,GAAG,MAAM,kCAAsB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAEhE,OAAO,MAAM,CAAC,OAAO,CAAC;IACvB,CAAC;CACD,CAAA;AA3EY,sCAAa;wBAAb,aAAa;IADzB,IAAA,YAAO,GAAE;GACG,aAAa,CA2EzB"}
+{"version":3,"file":"websocket.push.js","sourceRoot":"","sources":["../../src/push/websocket.push.ts"],"names":[],"mappings":"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"}

package/dist/scaling/constants.d.ts

@@ -2,5 +2,5 @@ export declare const QUEUE_NAME = "jobs";
 export declare const JOB_TYPE_NAME = "job";
 export declare const COMMAND_PUBSUB_CHANNEL = "n8n.commands";
 export declare const WORKER_RESPONSE_PUBSUB_CHANNEL = "n8n.worker-response";
-export declare const SELF_SEND_COMMANDS: Set<"reload-license" | "restart-event-bus" | "reload-external-secrets-providers" | "community-package-install" | "community-package-update" | "community-package-uninstall" | "get-worker-id" | "get-worker-status" | "add-webhooks-triggers-and-pollers" | "remove-triggers-and-pollers" | "display-workflow-activation" | "display-workflow-deactivation" | "display-workflow-activation-error" | "relay-execution-lifecycle-event" | "clear-test-webhooks">;
-export declare const IMMEDIATE_COMMANDS: Set<"reload-license" | "restart-event-bus" | "reload-external-secrets-providers" | "community-package-install" | "community-package-update" | "community-package-uninstall" | "get-worker-id" | "get-worker-status" | "add-webhooks-triggers-and-pollers" | "remove-triggers-and-pollers" | "display-workflow-activation" | "display-workflow-deactivation" | "display-workflow-activation-error" | "relay-execution-lifecycle-event" | "clear-test-webhooks">;
+export declare const SELF_SEND_COMMANDS: Set<"reload-license" | "restart-event-bus" | "reload-external-secrets-providers" | "community-package-install" | "community-package-update" | "community-package-uninstall" | "get-worker-id" | "get-worker-status" | "add-webhooks-triggers-and-pollers" | "remove-triggers-and-pollers" | "display-workflow-activation" | "display-workflow-deactivation" | "display-workflow-activation-error" | "relay-execution-lifecycle-event" | "clear-test-webhooks" | "reload-oidc-config">;
+export declare const IMMEDIATE_COMMANDS: Set<"reload-license" | "restart-event-bus" | "reload-external-secrets-providers" | "community-package-install" | "community-package-update" | "community-package-uninstall" | "get-worker-id" | "get-worker-status" | "add-webhooks-triggers-and-pollers" | "remove-triggers-and-pollers" | "display-workflow-activation" | "display-workflow-deactivation" | "display-workflow-activation-error" | "relay-execution-lifecycle-event" | "clear-test-webhooks" | "reload-oidc-config">;

package/dist/scaling/pubsub/pubsub.event-map.d.ts

@@ -4,6 +4,7 @@ export type PubSubCommandMap = {
     'reload-license': never;
     'restart-event-bus': never;
     'reload-external-secrets-providers': never;
+    'reload-oidc-config': never;
     'community-package-install': {
         packageName: string;
         packageVersion: string;
@@ -35,6 +36,7 @@ export type PubSubCommandMap = {
     };
     'relay-execution-lifecycle-event': PushMessage & {
         pushRef: string;
+        asBinary: boolean;
     };
     'clear-test-webhooks': {
         webhookKey: string;

package/dist/scaling/pubsub/pubsub.registry.d.ts

@@ -8,5 +8,6 @@ export declare class PubSubRegistry {
     private readonly pubSubMetadata;
     private readonly pubsubEventBus;
     constructor(logger: Logger, instanceSettings: InstanceSettings, pubSubMetadata: PubSubMetadata, pubsubEventBus: PubSubEventBus);
+    private eventHandlers;
     init(): void;
 }

package/dist/scaling/pubsub/pubsub.registry.js

@@ -21,22 +21,29 @@ let PubSubRegistry = class PubSubRegistry {
         this.instanceSettings = instanceSettings;
         this.pubSubMetadata = pubSubMetadata;
         this.pubsubEventBus = pubsubEventBus;
+        this.eventHandlers = [];
         this.logger = this.logger.scoped('pubsub');
     }
     init() {
         const { instanceSettings, pubSubMetadata } = this;
+        for (const { eventName, handler } of this.eventHandlers) {
+            this.pubsubEventBus.off(eventName, handler);
+        }
+        this.eventHandlers = [];
         const handlers = pubSubMetadata.getHandlers();
         for (const { eventHandlerClass, methodName, eventName, filter } of handlers) {
             const handlerClass = di_1.Container.get(eventHandlerClass);
             if (!filter?.instanceType || filter.instanceType === instanceSettings.instanceType) {
                 this.logger.debug(`Registered a "${eventName}" event handler on ${eventHandlerClass.name}#${methodName}`);
-                this.pubsubEventBus.on(eventName, async (...args) => {
+                const eventHandler = async (...args) => {
                     const shouldTrigger = filter?.instanceType !== 'main' ||
                         !filter.instanceRole ||
                         filter.instanceRole === instanceSettings.instanceRole;
                     if (shouldTrigger)
                         await handlerClass[methodName].call(handlerClass, ...args);
-                });
+                };
+                this.pubsubEventBus.on(eventName, eventHandler);
+                this.eventHandlers.push({ eventName, handler: eventHandler });
             }
         }
     }