n8n 2.19.2 → 2.19.4

package/dist/scaling/multi-main-setup-legacy.d.ts

@@ -0,0 +1,25 @@
+import type { Logger } from '@n8n/backend-common';
+import type { GlobalConfig } from '@n8n/config';
+import type { ErrorReporter, InstanceSettings } from 'n8n-core';
+import type { Publisher } from '../scaling/pubsub/publisher.service';
+import type { RedisClientService } from '../services/redis-client.service';
+import type { MultiMainStrategy } from './multi-main-setup.types';
+type EmitFn = (event: 'leader-takeover' | 'leader-stepdown') => void;
+export declare class MultiMainSetupLegacy implements MultiMainStrategy {
+    private readonly logger;
+    private readonly instanceSettings;
+    private readonly publisher;
+    private readonly redisClientService;
+    private readonly globalConfig;
+    private readonly errorReporter;
+    private readonly emit;
+    private leaderKey;
+    private readonly leaderKeyTtl;
+    constructor(logger: Logger, instanceSettings: InstanceSettings, publisher: Publisher, redisClientService: RedisClientService, globalConfig: GlobalConfig, errorReporter: ErrorReporter, emit: EmitFn);
+    init(): Promise<void>;
+    shutdown(): Promise<void>;
+    checkLeader(): Promise<void>;
+    private tryBecomeLeader;
+    fetchLeaderKey(): Promise<string | null>;
+}
+export {};

package/dist/scaling/multi-main-setup-legacy.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MultiMainSetupLegacy = void 0;
+class MultiMainSetupLegacy {
+    constructor(logger, instanceSettings, publisher, redisClientService, globalConfig, errorReporter, emit) {
+        this.logger = logger;
+        this.instanceSettings = instanceSettings;
+        this.publisher = publisher;
+        this.redisClientService = redisClientService;
+        this.globalConfig = globalConfig;
+        this.errorReporter = errorReporter;
+        this.emit = emit;
+        this.leaderKeyTtl = this.globalConfig.multiMainSetup.ttl;
+    }
+    async init() {
+        const prefix = this.globalConfig.redis.prefix;
+        const validPrefix = this.redisClientService.toValidPrefix(prefix);
+        this.leaderKey = validPrefix + ':main_instance_leader';
+        await this.tryBecomeLeader();
+    }
+    async shutdown() {
+        const { isLeader } = this.instanceSettings;
+        if (isLeader)
+            await this.publisher.clear(this.leaderKey);
+    }
+    async checkLeader() {
+        const leaderId = await this.publisher.get(this.leaderKey);
+        const { hostId } = this.instanceSettings;
+        if (leaderId === hostId) {
+            if (!this.instanceSettings.isLeader) {
+                this.errorReporter.info(`[Instance ID ${hostId}] Remote/Local leadership mismatch, marking self as leader`, {
+                    shouldBeLogged: true,
+                    shouldReport: true,
+                });
+                this.instanceSettings.markAsLeader();
+                this.emit('leader-takeover');
+            }
+            this.logger.debug(`[Instance ID ${hostId}] Leader is this instance`);
+            await this.publisher.setExpiration(this.leaderKey, this.leaderKeyTtl);
+            return;
+        }
+        if (leaderId && leaderId !== hostId) {
+            this.logger.debug(`[Instance ID ${hostId}] Leader is other instance "${leaderId}"`);
+            if (this.instanceSettings.isLeader) {
+                this.instanceSettings.markAsFollower();
+                this.emit('leader-stepdown');
+                this.logger.warn('[Multi-main setup] Leader failed to renew leader key');
+            }
+            return;
+        }
+        if (!leaderId) {
+            this.logger.debug(`[Instance ID ${hostId}] Leadership vacant, attempting to become leader...`);
+            this.instanceSettings.markAsFollower();
+            this.emit('leader-stepdown');
+            await this.tryBecomeLeader();
+        }
+    }
+    async tryBecomeLeader() {
+        const { hostId } = this.instanceSettings;
+        const keySetSuccessfully = await this.publisher.setIfNotExists(this.leaderKey, hostId, this.leaderKeyTtl);
+        if (keySetSuccessfully) {
+            this.logger.info(`[Instance ID ${hostId}] Leader is now this instance`);
+            this.instanceSettings.markAsLeader();
+            this.emit('leader-takeover');
+        }
+        else {
+            this.instanceSettings.markAsFollower();
+        }
+    }
+    async fetchLeaderKey() {
+        return await this.publisher.get(this.leaderKey);
+    }
+}
+exports.MultiMainSetupLegacy = MultiMainSetupLegacy;
+//# sourceMappingURL=multi-main-setup-legacy.js.map

package/dist/scaling/multi-main-setup-legacy.js.map

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

package/dist/scaling/multi-main-setup-v2.d.ts

@@ -0,0 +1,25 @@
+import type { LeaderElectionClient } from '../scaling/leader-election-client';
+import type { Logger } from '@n8n/backend-common';
+import type { ErrorReporter, InstanceSettings } from 'n8n-core';
+import type { MultiMainStrategy } from './multi-main-setup.types';
+type EmitFn = (event: 'leader-takeover' | 'leader-stepdown') => void;
+export declare class MultiMainSetupV2 implements MultiMainStrategy {
+    private readonly logger;
+    private readonly instanceSettings;
+    private readonly errorReporter;
+    private readonly client;
+    private readonly emit;
+    private leaderCheckInProgress;
+    private get hostId();
+    constructor(logger: Logger, instanceSettings: InstanceSettings, errorReporter: ErrorReporter, client: LeaderElectionClient, emit: EmitFn);
+    init(): Promise<void>;
+    shutdown(): Promise<void>;
+    checkLeader(): Promise<void>;
+    private checkAreWeStillLeader;
+    private checkCanBecomeLeader;
+    private takeOverAsLeader;
+    private stepDownToFollower;
+    fetchLeaderKey(): Promise<string | null>;
+    private logRedisCommandFailure;
+}
+export {};

package/dist/scaling/multi-main-setup-v2.js

@@ -0,0 +1,143 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MultiMainSetupV2 = void 0;
+const node_assert_1 = __importDefault(require("node:assert"));
+class MultiMainSetupV2 {
+    get hostId() {
+        return this.instanceSettings.hostId;
+    }
+    constructor(logger, instanceSettings, errorReporter, client, emit) {
+        this.logger = logger;
+        this.instanceSettings = instanceSettings;
+        this.errorReporter = errorReporter;
+        this.client = client;
+        this.emit = emit;
+        this.leaderCheckInProgress = false;
+    }
+    async init() {
+        const result = await this.client.setLeaderIfNotExists();
+        if (!result.ok) {
+            this.logRedisCommandFailure('Failed to set leader key in Redis during init', result.error);
+            this.instanceSettings.markAsFollower();
+        }
+        else if (result.result) {
+            this.takeOverAsLeader();
+        }
+        else {
+            this.instanceSettings.markAsFollower();
+        }
+    }
+    async shutdown() {
+        const { isLeader } = this.instanceSettings;
+        if (isLeader) {
+            const result = await this.client.clearLeader();
+            if (!result.ok) {
+                this.logger.warn('Failed to clear leader key from Redis', { error: result.error });
+            }
+        }
+        this.client.destroy();
+    }
+    async checkLeader() {
+        if (this.leaderCheckInProgress) {
+            this.logger.warn('Previous leader check is still in progress, skipping this check');
+            return;
+        }
+        this.leaderCheckInProgress = true;
+        try {
+            if (this.instanceSettings.isLeader) {
+                await this.checkAreWeStillLeader();
+            }
+            else {
+                await this.checkCanBecomeLeader();
+            }
+        }
+        finally {
+            this.leaderCheckInProgress = false;
+        }
+    }
+    async checkAreWeStillLeader() {
+        (0, node_assert_1.default)(this.instanceSettings.isLeader);
+        const renewTtlResult = await this.client.tryRenewLeaderTtl();
+        if (!renewTtlResult.ok) {
+            this.logRedisCommandFailure('Failed to renew leader TTL', renewTtlResult.error);
+            return;
+        }
+        const renewalResult = renewTtlResult.result;
+        if (renewalResult.id === 'success') {
+            this.logger.debug(`[Instance ID ${this.hostId}] Leader is this instance`);
+            return;
+        }
+        this.logger.warn('[Multi-main setup] Leader failed to renew leader key');
+        if (renewalResult.id === 'other-host-is-leader') {
+            this.logger.debug(`[Instance ID ${this.hostId}] Leader is other instance "${renewalResult.currentLeaderId}"`);
+            this.stepDownToFollower();
+            return;
+        }
+        (0, node_assert_1.default)(renewalResult.id === 'key-missing');
+        const result = await this.client.setLeaderIfNotExists();
+        if (!result.ok) {
+            this.logRedisCommandFailure('Failed to set leader key in Redis', result.error);
+            this.stepDownToFollower();
+            return;
+        }
+        const wasSet = result.result;
+        if (!wasSet) {
+            this.stepDownToFollower();
+        }
+    }
+    async checkCanBecomeLeader() {
+        (0, node_assert_1.default)(!this.instanceSettings.isLeader);
+        const getResult = await this.client.getLeader();
+        if (!getResult.ok) {
+            this.logRedisCommandFailure('Failed to get leader key from Redis', getResult.error);
+            return;
+        }
+        const leaderId = getResult.result;
+        if (leaderId && leaderId === this.hostId) {
+            this.errorReporter.info(`[Instance ID ${this.hostId}] Remote/Local leadership mismatch, marking self as leader`, {
+                shouldBeLogged: true,
+                shouldReport: true,
+            });
+            this.takeOverAsLeader();
+            return;
+        }
+        if (leaderId) {
+            this.logger.debug(`[Instance ID ${this.hostId}] Leader is other instance "${leaderId}"`);
+            return;
+        }
+        this.logger.debug(`[Instance ID ${this.hostId}] Leadership vacant, attempting to become leader...`);
+        const result = await this.client.setLeaderIfNotExists();
+        if (!result.ok) {
+            this.logger.warn('Failed to try leader key set in Redis', { error: result.error });
+            return;
+        }
+        const wasSet = result.result;
+        if (wasSet) {
+            this.takeOverAsLeader();
+        }
+    }
+    takeOverAsLeader() {
+        (0, node_assert_1.default)(!this.instanceSettings.isLeader);
+        this.logger.info(`[Instance ID ${this.hostId}] Leader is now this instance`);
+        this.instanceSettings.markAsLeader();
+        this.emit('leader-takeover');
+    }
+    stepDownToFollower() {
+        (0, node_assert_1.default)(this.instanceSettings.isLeader);
+        this.logger.info(`[Instance ID ${this.hostId}] This is now a follower instance`);
+        this.instanceSettings.markAsFollower();
+        this.emit('leader-stepdown');
+    }
+    async fetchLeaderKey() {
+        const result = await this.client.getLeader();
+        return result.ok ? result.result : null;
+    }
+    logRedisCommandFailure(message, error) {
+        this.logger.warn(`${message}: ${error.message}`, { error });
+    }
+}
+exports.MultiMainSetupV2 = MultiMainSetupV2;
+//# sourceMappingURL=multi-main-setup-v2.js.map

package/dist/scaling/multi-main-setup-v2.js.map

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

package/dist/scaling/multi-main-setup.ee.d.ts

@@ -1,10 +1,10 @@
+import { TypedEmitter } from '../typed-emitter';
 import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { MultiMainMetadata } from '@n8n/decorators';
 import { ErrorReporter, InstanceSettings } from 'n8n-core';
 import { Publisher } from '../scaling/pubsub/publisher.service';
 import { RedisClientService } from '../services/redis-client.service';
-import { TypedEmitter } from '../typed-emitter';
 type MultiMainEvents = {
     'leader-stepdown': never;
     'leader-takeover': never;
@@ -12,19 +12,16 @@ type MultiMainEvents = {
 export declare class MultiMainSetup extends TypedEmitter<MultiMainEvents> {
     private readonly logger;
     private readonly instanceSettings;
-    private readonly publisher;
-    private readonly redisClientService;
     private readonly globalConfig;
     private readonly metadata;
     private readonly errorReporter;
-    constructor(logger: Logger, instanceSettings: InstanceSettings, publisher: Publisher, redisClientService: RedisClientService, globalConfig: GlobalConfig, metadata: MultiMainMetadata, errorReporter: ErrorReporter);
-    private leaderKey;
-    private readonly leaderKeyTtl;
+    private readonly publisher;
+    private readonly redisClientService;
+    private readonly strategy;
     private leaderCheckInterval;
+    constructor(logger: Logger, instanceSettings: InstanceSettings, globalConfig: GlobalConfig, metadata: MultiMainMetadata, errorReporter: ErrorReporter, publisher: Publisher, redisClientService: RedisClientService);
     init(): Promise<void>;
     shutdown(): Promise<void>;
-    private checkLeader;
-    private tryBecomeLeader;
     fetchLeaderKey(): Promise<string | null>;
     registerEventHandlers(): void;
 }

package/dist/scaling/multi-main-setup.ee.js

@@ -10,6 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MultiMainSetup = void 0;
+const typed_emitter_1 = require("../typed-emitter");
 const backend_common_1 = require("@n8n/backend-common");
 const config_1 = require("@n8n/config");
 const constants_1 = require("@n8n/constants");
@@ -18,81 +19,41 @@ const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
 const publisher_service_1 = require("../scaling/pubsub/publisher.service");
 const redis_client_service_1 = require("../services/redis-client.service");
-const typed_emitter_1 = require("../typed-emitter");
+const multi_main_setup_legacy_1 = require("./multi-main-setup-legacy");
+const multi_main_setup_v2_1 = require("./multi-main-setup-v2");
 let MultiMainSetup = class MultiMainSetup extends typed_emitter_1.TypedEmitter {
-    constructor(logger, instanceSettings, publisher, redisClientService, globalConfig, metadata, errorReporter) {
+    constructor(logger, instanceSettings, globalConfig, metadata, errorReporter, publisher, redisClientService) {
         super();
         this.logger = logger;
         this.instanceSettings = instanceSettings;
-        this.publisher = publisher;
-        this.redisClientService = redisClientService;
         this.globalConfig = globalConfig;
         this.metadata = metadata;
         this.errorReporter = errorReporter;
-        this.leaderKeyTtl = this.globalConfig.multiMainSetup.ttl;
+        this.publisher = publisher;
+        this.redisClientService = redisClientService;
         this.logger = this.logger.scoped(['scaling', 'multi-main-setup']);
+        const emitFn = (event) => this.emit(event);
+        if (this.globalConfig.multiMainSetup.newLeaderElection) {
+            const { LeaderElectionClient } = require('../scaling/leader-election-client');
+            const client = di_1.Container.get(LeaderElectionClient);
+            this.strategy = new multi_main_setup_v2_1.MultiMainSetupV2(this.logger, this.instanceSettings, this.errorReporter, client, emitFn);
+        }
+        else {
+            this.strategy = new multi_main_setup_legacy_1.MultiMainSetupLegacy(this.logger, this.instanceSettings, this.publisher, this.redisClientService, this.globalConfig, this.errorReporter, emitFn);
+        }
     }
     async init() {
-        const prefix = this.globalConfig.redis.prefix;
-        const validPrefix = this.redisClientService.toValidPrefix(prefix);
-        this.leaderKey = validPrefix + ':main_instance_leader';
-        await this.tryBecomeLeader();
+        await this.strategy.init();
         this.leaderCheckInterval = setInterval(async () => {
-            await this.checkLeader();
+            await this.strategy.checkLeader();
         }, this.globalConfig.multiMainSetup.interval * constants_1.Time.seconds.toMilliseconds);
     }
     async shutdown() {
         clearInterval(this.leaderCheckInterval);
-        const { isLeader } = this.instanceSettings;
-        if (isLeader)
-            await this.publisher.clear(this.leaderKey);
-    }
-    async checkLeader() {
-        const leaderId = await this.publisher.get(this.leaderKey);
-        const { hostId } = this.instanceSettings;
-        if (leaderId === hostId) {
-            if (!this.instanceSettings.isLeader) {
-                this.errorReporter.info(`[Instance ID ${hostId}] Remote/Local leadership mismatch, marking self as leader`, {
-                    shouldBeLogged: true,
-                    shouldReport: true,
-                });
-                this.instanceSettings.markAsLeader();
-                this.emit('leader-takeover');
-            }
-            this.logger.debug(`[Instance ID ${hostId}] Leader is this instance`);
-            await this.publisher.setExpiration(this.leaderKey, this.leaderKeyTtl);
-            return;
-        }
-        if (leaderId && leaderId !== hostId) {
-            this.logger.debug(`[Instance ID ${hostId}] Leader is other instance "${leaderId}"`);
-            if (this.instanceSettings.isLeader) {
-                this.instanceSettings.markAsFollower();
-                this.emit('leader-stepdown');
-                this.logger.warn('[Multi-main setup] Leader failed to renew leader key');
-            }
-            return;
-        }
-        if (!leaderId) {
-            this.logger.debug(`[Instance ID ${hostId}] Leadership vacant, attempting to become leader...`);
-            this.instanceSettings.markAsFollower();
-            this.emit('leader-stepdown');
-            await this.tryBecomeLeader();
-        }
-    }
-    async tryBecomeLeader() {
-        const { hostId } = this.instanceSettings;
-        const keySetSuccessfully = await this.publisher.setIfNotExists(this.leaderKey, hostId, this.leaderKeyTtl);
-        if (keySetSuccessfully) {
-            this.logger.info(`[Instance ID ${hostId}] Leader is now this instance`);
-            this.instanceSettings.markAsLeader();
-            this.emit('leader-takeover');
-        }
-        else {
-            this.instanceSettings.markAsFollower();
-        }
+        await this.strategy.shutdown();
     }
     async fetchLeaderKey() {
-        return await this.publisher.get(this.leaderKey);
+        return await this.strategy.fetchLeaderKey();
     }
     registerEventHandlers() {
         const handlers = this.metadata.getHandlers();
@@ -109,10 +70,10 @@ exports.MultiMainSetup = MultiMainSetup = __decorate([
     (0, di_1.Service)(),
     __metadata("design:paramtypes", [backend_common_1.Logger,
         n8n_core_1.InstanceSettings,
-        publisher_service_1.Publisher,
-        redis_client_service_1.RedisClientService,
         config_1.GlobalConfig,
         decorators_1.MultiMainMetadata,
-        n8n_core_1.ErrorReporter])
+        n8n_core_1.ErrorReporter,
+        publisher_service_1.Publisher,
+        redis_client_service_1.RedisClientService])
 ], MultiMainSetup);
 //# sourceMappingURL=multi-main-setup.ee.js.map

package/dist/scaling/multi-main-setup.ee.js.map

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

package/dist/scaling/multi-main-setup.types.d.ts

@@ -0,0 +1,6 @@
+export interface MultiMainStrategy {
+    init(): Promise<void>;
+    shutdown(): Promise<void>;
+    checkLeader(): Promise<void>;
+    fetchLeaderKey(): Promise<string | null>;
+}

package/dist/scaling/multi-main-setup.types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=multi-main-setup.types.js.map

package/dist/scaling/multi-main-setup.types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"multi-main-setup.types.js","sourceRoot":"","sources":["../../src/scaling/multi-main-setup.types.ts"],"names":[],"mappings":""}

package/dist/scaling/pubsub/publisher.service.js.map

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

package/dist/scaling/redis/redis.types.d.ts

@@ -1,4 +1,4 @@
 export type RedisClientType = N8nRedisClientType | BullRedisClientType;
-type N8nRedisClientType = 'subscriber(n8n)' | 'publisher(n8n)' | 'cache(n8n)' | 'registry(n8n)';
+type N8nRedisClientType = 'subscriber(n8n)' | 'publisher(n8n)' | 'cache(n8n)' | 'registry(n8n)' | 'leader(n8n)';
 type BullRedisClientType = 'subscriber(bull)' | 'client(bull)' | 'bclient(bull)';
 export {};

package/dist/services/dynamic-node-parameters.service.d.ts

@@ -22,6 +22,7 @@ export declare class DynamicNodeParametersService {
     getResourceMappingFields(methodName: string, path: string, additionalData: IWorkflowExecuteAdditionalData, nodeTypeAndVersion: INodeTypeNameVersion, currentNodeParameters: INodeParameters, credentials?: INodeCredentials): Promise<ResourceMapperFields>;
     getLocalResourceMappingFields(methodName: string, path: string, additionalData: IWorkflowExecuteAdditionalData, nodeTypeAndVersion: INodeTypeNameVersion): Promise<ResourceMapperFields>;
     getActionResult(handler: string, path: string, additionalData: IWorkflowExecuteAdditionalData, nodeTypeAndVersion: INodeTypeNameVersion, currentNodeParameters: INodeParameters, payload: IDataObject | string | undefined, credentials?: INodeCredentials): Promise<NodeParameterValueType>;
+    private withExpressionIsolate;
     private getMethod;
     private getNodeType;
     private getWorkflow;

package/dist/services/dynamic-node-parameters.service.js

@@ -67,7 +67,9 @@ let DynamicNodeParametersService = class DynamicNodeParametersService {
         const method = this.getMethod('loadOptions', methodName, nodeType);
         const workflow = this.getWorkflow(nodeTypeAndVersion, currentNodeParameters, credentials);
         const thisArgs = this.getThisArg(path, additionalData, workflow);
-        return await method.call(thisArgs);
+        return await this.withExpressionIsolate(workflow, async () => {
+            return await method.call(thisArgs);
+        });
     }
     async getOptionsViaLoadOptions(loadOptions, additionalData, nodeTypeAndVersion, currentNodeParameters, credentials) {
         const nodeType = this.getNodeType(nodeTypeAndVersion);
@@ -107,28 +109,32 @@ let DynamicNodeParametersService = class DynamicNodeParametersService {
         };
         const executeFunctions = new n8n_core_1.ExecuteContext(workflow, node, additionalData, mode, runExecutionData, runIndex, connectionInputData, inputData, executeData, []);
         const routingNode = new n8n_core_1.RoutingNode(executeFunctions, tempNodeType);
-        const optionsData = await routingNode.runNode();
-        if (optionsData?.length === 0) {
-            return [];
-        }
-        if (!Array.isArray(optionsData)) {
-            throw new n8n_workflow_1.UnexpectedError('The returned data is not an array');
-        }
-        return optionsData[0].map((item) => item.json);
+        return await this.withExpressionIsolate(workflow, async () => {
+            const optionsData = await routingNode.runNode();
+            if (optionsData?.length === 0) {
+                return [];
+            }
+            if (!Array.isArray(optionsData)) {
+                throw new n8n_workflow_1.UnexpectedError('The returned data is not an array');
+            }
+            return optionsData[0].map((item) => item.json);
+        });
     }
     async getResourceLocatorResults(methodName, path, additionalData, nodeTypeAndVersion, currentNodeParameters, credentials, filter, paginationToken) {
         const nodeType = this.getNodeType(nodeTypeAndVersion);
         const method = this.getMethod('listSearch', methodName, nodeType);
         const workflow = this.getWorkflow(nodeTypeAndVersion, currentNodeParameters, credentials);
         const thisArgs = this.getThisArg(path, additionalData, workflow);
-        return await method.call(thisArgs, filter, paginationToken);
+        return await this.withExpressionIsolate(workflow, async () => {
+            return await method.call(thisArgs, filter, paginationToken);
+        });
     }
     async getResourceMappingFields(methodName, path, additionalData, nodeTypeAndVersion, currentNodeParameters, credentials) {
         const nodeType = this.getNodeType(nodeTypeAndVersion);
         const method = this.getMethod('resourceMapping', methodName, nodeType);
         const workflow = this.getWorkflow(nodeTypeAndVersion, currentNodeParameters, credentials);
         const thisArgs = this.getThisArg(path, additionalData, workflow);
-        return this.removeDuplicateResourceMappingFields(await method.call(thisArgs));
+        return await this.withExpressionIsolate(workflow, async () => this.removeDuplicateResourceMappingFields(await method.call(thisArgs)));
     }
     async getLocalResourceMappingFields(methodName, path, additionalData, nodeTypeAndVersion) {
         const nodeType = this.getNodeType(nodeTypeAndVersion);
@@ -141,7 +147,18 @@ let DynamicNodeParametersService = class DynamicNodeParametersService {
         const method = this.getMethod('actionHandler', handler, nodeType);
         const workflow = this.getWorkflow(nodeTypeAndVersion, currentNodeParameters, credentials);
         const thisArgs = this.getThisArg(path, additionalData, workflow);
-        return await method.call(thisArgs, payload);
+        return await this.withExpressionIsolate(workflow, async () => {
+            return await method.call(thisArgs, payload);
+        });
+    }
+    async withExpressionIsolate(workflow, fn) {
+        await workflow.expression.acquireIsolate();
+        try {
+            return await fn();
+        }
+        finally {
+            await workflow.expression.releaseIsolate();
+        }
     }
     getMethod(type, methodName, nodeType) {
         const methodsOfType = nodeType.methods?.[type];