n8n 2.43.4 → 2.44.1

package/dist/services/pruning/executions-pruning.service.js

@@ -11,65 +11,18 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExecutionsPruningService = void 0;
 const backend_common_1 = require("@n8n/backend-common");
-const config_1 = require("@n8n/config");
-const constants_1 = require("@n8n/constants");
 const db_1 = require("@n8n/db");
-const decorators_1 = require("@n8n/decorators");
 const di_1 = require("@n8n/di");
-const n8n_core_1 = require("n8n-core");
-const ensure_error_1 = require("@n8n/utils/errors/ensure-error");
-const node_assert_1 = require("node:assert");
+const sleep_1 = require("@n8n/utils/sleep");
 const execution_persistence_1 = require("../../executions/execution-persistence");
+const BATCH_DELAY_MS = 1000;
 let ExecutionsPruningService = class ExecutionsPruningService {
-    constructor(logger, instanceSettings, dbConnection, executionRepository, executionPersistence, executionsConfig) {
+    constructor(logger, executionRepository, executionPersistence) {
         this.logger = logger;
-        this.instanceSettings = instanceSettings;
-        this.dbConnection = dbConnection;
         this.executionRepository = executionRepository;
         this.executionPersistence = executionPersistence;
-        this.executionsConfig = executionsConfig;
-        this.rates = {
-            hardDeletion: this.executionsConfig.pruneDataIntervals.hardDelete * constants_1.Time.minutes.toMilliseconds,
-        };
-        this.batchSize = 100;
-        this.isShuttingDown = false;
         this.logger = this.logger.scoped('pruning');
     }
-    init() {
-        (0, node_assert_1.strict)(this.instanceSettings.instanceRole !== 'unset', 'Instance role is not set');
-        if (this.instanceSettings.isLeader)
-            this.startPruning();
-    }
-    get isEnabled() {
-        return (this.executionsConfig.pruneData &&
-            this.instanceSettings.instanceType === 'main' &&
-            this.instanceSettings.isLeader);
-    }
-    startPruning() {
-        const { connectionState } = this.dbConnection;
-        if (!this.isEnabled || !connectionState.migrated || this.isShuttingDown)
-            return;
-        this.scheduleNextHardDeletion();
-        this.logger.debug('Started hard-deletion timer');
-    }
-    stopPruning() {
-        if (!this.hardDeletionTimeout)
-            return;
-        clearTimeout(this.hardDeletionTimeout);
-        this.hardDeletionTimeout = undefined;
-        this.logger.debug('Stopped hard-deletion timer');
-    }
-    scheduleNextHardDeletion(rateMs = this.rates.hardDeletion) {
-        this.hardDeletionTimeout = setTimeout(() => {
-            this.hardDelete()
-                .then((rate) => this.scheduleNextHardDeletion(rate))
-                .catch((error) => {
-                this.scheduleNextHardDeletion(1_000);
-                this.logger.error('Failed to hard-delete executions', { error: (0, ensure_error_1.ensureError)(error) });
-            });
-        }, rateMs);
-        this.logger.debug(`Hard-deletion in next ${rateMs * constants_1.Time.milliseconds.toMinutes} minutes`);
-    }
     async softDelete() {
         const result = await this.executionRepository.softDeletePrunableExecutions();
         if (result.affected === 0) {
@@ -78,53 +31,66 @@ let ExecutionsPruningService = class ExecutionsPruningService {
         }
         this.logger.debug('Soft-deleted executions', { count: result.affected });
     }
-    shutdown() {
-        this.isShuttingDown = true;
-        this.stopPruning();
-    }
-    async hardDelete() {
-        const refs = await this.executionRepository.findSoftDeletedExecutions();
-        if (refs.length === 0) {
-            this.logger.debug('Found no executions to hard-delete');
-            return this.rates.hardDeletion;
+    async hardDelete(signal) {
+        const { hardDeletionBatchSize } = this.executionRepository;
+        let before;
+        let deletedCount = 0;
+        let hasMore = true;
+        while (hasMore && !signal.aborted) {
+            const refs = await this.executionRepository.findSoftDeletedExecutions(before);
+            if (!signal.aborted) {
+                deletedCount += await this.hardDeleteBatch(refs, signal);
+            }
+            hasMore = refs.length === hardDeletionBatchSize;
+            if (hasMore) {
+                before = refs.at(-1)?.executionId;
+                await this.waitBetweenBatches(signal);
+            }
         }
-        const executionIds = refs.map((r) => r.executionId);
+        this.logger.debug('Hard-deleted executions', { count: deletedCount });
+    }
+    async hardDeleteBatch(refs, signal) {
         try {
             await this.executionPersistence.hardDelete(refs);
-            this.logger.debug('Hard-deleted executions', { executionIds });
+            return refs.length;
+        }
+        catch (batchError) {
+            const deleted = await this.hardDeleteOneByOne(refs, signal);
+            if (deleted === 0)
+                throw batchError;
+            return deleted;
+        }
+    }
+    async hardDeleteOneByOne(refs, signal) {
+        const failedInBatch = [];
+        let deleted = 0;
+        for (const ref of refs) {
+            if (signal.aborted)
+                break;
+            try {
+                await this.executionPersistence.hardDelete(ref);
+                deleted++;
+            }
+            catch {
+                failedInBatch.push(ref.executionId);
+            }
+        }
+        if (failedInBatch.length > 0) {
+            this.logger.error('Failed to hard-delete executions', { executionIds: failedInBatch });
+        }
+        return deleted;
+    }
+    async waitBetweenBatches(signal) {
+        try {
+            await (0, sleep_1.sleep)(BATCH_DELAY_MS, signal);
         }
-        catch (error) {
-            this.logger.error('Failed to hard-delete executions', {
-                executionIds,
-                error: (0, ensure_error_1.ensureError)(error),
-            });
+        catch {
         }
-        if (refs.length >= this.batchSize)
-            return 1 * constants_1.Time.seconds.toMilliseconds;
-        return this.rates.hardDeletion;
     }
 };
 exports.ExecutionsPruningService = ExecutionsPruningService;
-__decorate([
-    (0, decorators_1.OnLeaderTakeover)(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", void 0)
-], ExecutionsPruningService.prototype, "startPruning", null);
-__decorate([
-    (0, decorators_1.OnLeaderStepdown)(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", void 0)
-], ExecutionsPruningService.prototype, "stopPruning", null);
-__decorate([
-    (0, decorators_1.OnShutdown)(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", void 0)
-], ExecutionsPruningService.prototype, "shutdown", null);
 exports.ExecutionsPruningService = ExecutionsPruningService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [backend_common_1.Logger, n8n_core_1.InstanceSettings, db_1.DbConnection, db_1.ExecutionRepository, execution_persistence_1.ExecutionPersistence, config_1.ExecutionsConfig])
+    __metadata("design:paramtypes", [backend_common_1.Logger, db_1.ExecutionRepository, execution_persistence_1.ExecutionPersistence])
 ], ExecutionsPruningService);
 //# sourceMappingURL=executions-pruning.service.js.map

package/dist/services/pruning/executions-pruning.service.js.map

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

package/dist/services/pruning/workflow-history-compaction-optimize.task.d.ts

@@ -9,6 +9,7 @@ export declare class WorkflowHistoryCompactionOptimizeTask implements SystemTask
     readonly schedule: SystemTaskSchedule;
     readonly effects: SystemTaskEffects;
     readonly placement: SystemTaskPlacement;
+    readonly timeoutSeconds: number;
     constructor(config: WorkflowHistoryCompactionConfig, compactionService: WorkflowHistoryCompactionService);
     run(signal: AbortSignal): Promise<void>;
 }

package/dist/services/pruning/workflow-history-compaction-optimize.task.js

@@ -22,6 +22,7 @@ let WorkflowHistoryCompactionOptimizeTask = class WorkflowHistoryCompactionOptim
         this.schedule = (0, decorators_1.intervalFromSeconds)((this.config.optimizingTimeWindowHours / 2) * constants_1.Time.hours.toSeconds);
         this.effects = 'idempotent';
         this.placement = { scope: 'cluster', durable: true };
+        this.timeoutSeconds = 30 * constants_1.Time.minutes.toSeconds;
     }
     async run(signal) {
         await this.compactionService.optimizeHistories(signal);

package/dist/services/pruning/workflow-history-compaction-optimize.task.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-history-compaction-optimize.task.js","sourceRoot":"","sources":["../../../src/services/pruning/workflow-history-compaction-optimize.task.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA8D;AAC9D,8CAAsC;AACtC,gDAAkE;AAGlE,+FAAyF;AAOlF,IAAM,qCAAqC,GAA3C,MAAM,qCAAqC;IAajD,YACkB,MAAuC,EACvC,iBAAmD;QADnD,WAAM,GAAN,MAAM,CAAiC;QACvC,sBAAiB,GAAjB,iBAAiB,CAAkC;QAd5D,SAAI,GAAG,sCAAsC,CAAC;QAI9C,aAAQ,GAAuB,IAAA,gCAAmB,EAC1D,CAAC,IAAI,CAAC,MAAM,CAAC,yBAAyB,GAAG,CAAC,CAAC,GAAG,gBAAI,CAAC,KAAK,CAAC,SAAS,CAClE,CAAC;QAEO,YAAO,GAAsB,YAAY,CAAC;QAE1C,cAAS,GAAwB,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAK3E,CAAC;IAEJ,KAAK,CAAC,GAAG,CAAC,MAAmB;QAC5B,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACxD,CAAC;CACD,CAAA;;gDArBY,qCAAqC;IADjD,IAAA,uBAAU,GAAE;qCAec,wCAA+B,EACpB,sEAAgC;GAfzD,qCAAqC,CAqBjD"}
+{"version":3,"file":"workflow-history-compaction-optimize.task.js","sourceRoot":"","sources":["../../../src/services/pruning/workflow-history-compaction-optimize.task.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA8D;AAC9D,8CAAsC;AACtC,gDAAkE;AAGlE,+FAAyF;AAOlF,IAAM,qCAAqC,GAA3C,MAAM,qCAAqC;IAiBjD,YACkB,MAAuC,EACvC,iBAAmD;QADnD,WAAM,GAAN,MAAM,CAAiC;QACvC,sBAAiB,GAAjB,iBAAiB,CAAkC;QAlB5D,SAAI,GAAG,sCAAsC,CAAC;QAI9C,aAAQ,GAAuB,IAAA,gCAAmB,EAC1D,CAAC,IAAI,CAAC,MAAM,CAAC,yBAAyB,GAAG,CAAC,CAAC,GAAG,gBAAI,CAAC,KAAK,CAAC,SAAS,CAClE,CAAC;QAEO,YAAO,GAAsB,YAAY,CAAC;QAE1C,cAAS,GAAwB,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAIrE,mBAAc,GAAG,EAAE,GAAG,gBAAI,CAAC,OAAO,CAAC,SAAS,CAAC;IAKnD,CAAC;IAEJ,KAAK,CAAC,GAAG,CAAC,MAAmB;QAC5B,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACxD,CAAC;CACD,CAAA;;gDAzBY,qCAAqC;IADjD,IAAA,uBAAU,GAAE;qCAmBc,wCAA+B,EACpB,sEAAgC;GAnBzD,qCAAqC,CAyBjD"}

package/dist/services/pruning/workflow-history-compaction-trim.task.d.ts

@@ -6,7 +6,9 @@ export declare class WorkflowHistoryCompactionTrimTask implements SystemTask {
     readonly name = "workflow-history-compaction-trim";
     readonly schedule: SystemTaskSchedule;
     readonly effects: SystemTaskEffects;
+    readonly misfireGraceSeconds: number;
     readonly placement: SystemTaskPlacement;
+    readonly timeoutSeconds: number;
     constructor(compactionService: WorkflowHistoryCompactionService);
     run(signal: AbortSignal): Promise<void>;
 }

package/dist/services/pruning/workflow-history-compaction-trim.task.js

@@ -17,15 +17,17 @@ let WorkflowHistoryCompactionTrimTask = class WorkflowHistoryCompactionTrimTask
     constructor(compactionService) {
         this.compactionService = compactionService;
         this.name = 'workflow-history-compaction-trim';
-        this.schedule = (0, decorators_1.intervalFromSeconds)(constants_1.Time.hours.toSeconds);
+        this.schedule = {
+            kind: 'cron',
+            cronExpression: '0 3 * * *',
+            timezone: null,
+        };
         this.effects = 'idempotent';
-        this.placement = { scope: 'cluster', durable: false };
+        this.misfireGraceSeconds = constants_1.Time.hours.toSeconds;
+        this.placement = { scope: 'cluster', durable: true };
+        this.timeoutSeconds = constants_1.Time.hours.toSeconds;
     }
     async run(signal) {
-        if (!this.compactionService.isTrimmingEnabled)
-            return;
-        if (new Date().getHours() !== 3)
-            return;
         await this.compactionService.trimLongRunningHistories(signal);
     }
 };

package/dist/services/pruning/workflow-history-compaction-trim.task.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-history-compaction-trim.task.js","sourceRoot":"","sources":["../../../src/services/pruning/workflow-history-compaction-trim.task.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAsC;AACtC,gDAAkE;AAGlE,+FAAyF;AAOlF,IAAM,iCAAiC,GAAvC,MAAM,iCAAiC;IAW7C,YAA6B,iBAAmD;QAAnD,sBAAiB,GAAjB,iBAAiB,CAAkC;QAVvE,SAAI,GAAG,kCAAkC,CAAC;QAI1C,aAAQ,GAAuB,IAAA,gCAAmB,EAAC,gBAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAEzE,YAAO,GAAsB,YAAY,CAAC;QAE1C,cAAS,GAAwB,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAEI,CAAC;IAEpF,KAAK,CAAC,GAAG,CAAC,MAAmB;QAC5B,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,iBAAiB;YAAE,OAAO;QACtD,IAAI,IAAI,IAAI,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC;YAAE,OAAO;QACxC,MAAM,IAAI,CAAC,iBAAiB,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;IAC/D,CAAC;CACD,CAAA;;4CAlBY,iCAAiC;IAD7C,IAAA,uBAAU,GAAE;qCAYoC,sEAAgC;GAXpE,iCAAiC,CAkB7C"}
+{"version":3,"file":"workflow-history-compaction-trim.task.js","sourceRoot":"","sources":["../../../src/services/pruning/workflow-history-compaction-trim.task.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAsC;AACtC,gDAA6C;AAG7C,+FAAyF;AAOlF,IAAM,iCAAiC,GAAvC,MAAM,iCAAiC;IAqB7C,YAA6B,iBAAmD;QAAnD,sBAAiB,GAAjB,iBAAiB,CAAkC;QApBvE,SAAI,GAAG,kCAAkC,CAAC;QAE1C,aAAQ,GAAuB;YACvC,IAAI,EAAE,MAAM;YACZ,cAAc,EAAE,WAAW;YAE3B,QAAQ,EAAE,IAAI;SACd,CAAC;QAEO,YAAO,GAAsB,YAAY,CAAC;QAI1C,wBAAmB,GAAG,gBAAI,CAAC,KAAK,CAAC,SAAS,CAAC;QAE3C,cAAS,GAAwB,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAGrE,mBAAc,GAAG,gBAAI,CAAC,KAAK,CAAC,SAAS,CAAC;IAEoC,CAAC;IAEpF,KAAK,CAAC,GAAG,CAAC,MAAmB;QAC5B,MAAM,IAAI,CAAC,iBAAiB,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;IAC/D,CAAC;CACD,CAAA;;4CA1BY,iCAAiC;IAD7C,IAAA,uBAAU,GAAE;qCAsBoC,sEAAgC;GArBpE,iCAAiC,CA0B7C"}

package/dist/services/pruning/workflow-history-compaction.service.d.ts

@@ -3,10 +3,6 @@ import { EventService } from '@n8n/backend-services';
 import { GlobalConfig, WorkflowHistoryCompactionConfig } from '@n8n/config';
 import { DbConnection, WorkflowHistoryRepository } from '@n8n/db';
 import { InstanceSettings } from 'n8n-core';
-export declare function getCompactionWindowDeltas(minimumAge: number, timeWindow: number, unitMs: number): {
-    startDelta: number;
-    endDelta: number;
-};
 export declare class WorkflowHistoryCompactionService {
     private readonly config;
     private readonly globalConfig;
@@ -21,11 +17,11 @@ export declare class WorkflowHistoryCompactionService {
     constructor(config: WorkflowHistoryCompactionConfig, globalConfig: GlobalConfig, logger: Logger, instanceSettings: InstanceSettings, dbConnection: DbConnection, workflowHistoryRepository: WorkflowHistoryRepository, eventService: EventService);
     init(): void;
     get isEnabled(): boolean;
-    get isTrimmingEnabled(): boolean;
     runStartupCompaction(): void;
     stopStartupCompaction(): void;
     trimLongRunningHistories(signal: AbortSignal): Promise<void>;
     optimizeHistories(signal: AbortSignal): Promise<void>;
+    private startOfToday;
     private compactHistories;
     private waitBetweenBatches;
 }

package/dist/services/pruning/workflow-history-compaction.service.js

@@ -10,7 +10,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkflowHistoryCompactionService = void 0;
-exports.getCompactionWindowDeltas = getCompactionWindowDeltas;
 const backend_common_1 = require("@n8n/backend-common");
 const backend_services_1 = require("@n8n/backend-services");
 const config_1 = require("@n8n/config");
@@ -21,11 +20,10 @@ const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
 const ensure_error_1 = require("@n8n/utils/errors/ensure-error");
 const sleep_1 = require("@n8n/utils/sleep");
+const luxon_1 = require("luxon");
 const n8n_workflow_1 = require("n8n-workflow");
 const node_assert_1 = require("node:assert");
-function getCompactionWindowDeltas(minimumAge, timeWindow, unitMs) {
-    return { startDelta: (minimumAge + timeWindow) * unitMs, endDelta: minimumAge * unitMs };
-}
+const workflow_history_compaction_utils_1 = require("./workflow-history-compaction.utils");
 let WorkflowHistoryCompactionService = class WorkflowHistoryCompactionService {
     constructor(config, globalConfig, logger, instanceSettings, dbConnection, workflowHistoryRepository, eventService) {
         this.config = config;
@@ -48,11 +46,6 @@ let WorkflowHistoryCompactionService = class WorkflowHistoryCompactionService {
     get isEnabled() {
         return this.instanceSettings.instanceType === 'main' && this.instanceSettings.isLeader;
     }
-    get isTrimmingEnabled() {
-        return (this.globalConfig.workflowHistory.pruneTime === -1 ||
-            this.globalConfig.workflowHistory.pruneTime * constants_1.Time.hours.toMilliseconds >=
-                this.config.trimmingMinimumAgeDays * constants_1.Time.days.toMilliseconds);
-    }
     runStartupCompaction() {
         const { connectionState } = this.dbConnection;
         if (!this.isEnabled || !connectionState.migrated)
@@ -62,9 +55,8 @@ let WorkflowHistoryCompactionService = class WorkflowHistoryCompactionService {
         this.startupAbort = new AbortController();
         const { signal } = this.startupAbort;
         void this.optimizeHistories(signal);
-        if (!this.isTrimmingEnabled)
-            return;
-        if (this.config.trimOnStartUp || new Date().getHours() === 3) {
+        if (this.config.trimOnStartUp &&
+            (0, workflow_history_compaction_utils_1.isTrimmingEnabled)(this.globalConfig.workflowHistory, this.config)) {
             void this.trimLongRunningHistories(signal);
         }
     }
@@ -77,9 +69,9 @@ let WorkflowHistoryCompactionService = class WorkflowHistoryCompactionService {
             return;
         }
         this.isTrimmingHistories = true;
-        const { startDelta, endDelta } = getCompactionWindowDeltas(this.config.trimmingMinimumAgeDays, this.config.trimmingTimeWindowDays, constants_1.Time.days.toMilliseconds);
+        const { startDelta, endDelta } = (0, workflow_history_compaction_utils_1.getCompactionWindowDeltas)(this.config.trimmingMinimumAgeDays, this.config.trimmingTimeWindowDays, constants_1.Time.days.toMilliseconds);
         try {
-            await this.compactHistories(startDelta, endDelta, [
+            await this.compactHistories(this.startOfToday(), startDelta, endDelta, [
                 n8n_workflow_1.RULES.makeMergeDependingOnSizeRule(new Map([
                     [0, 60 * 1_000],
                     [100, 10 * 60 * 1_000],
@@ -99,18 +91,21 @@ let WorkflowHistoryCompactionService = class WorkflowHistoryCompactionService {
             return;
         }
         this.isOptimizingHistories = true;
-        const { startDelta, endDelta } = getCompactionWindowDeltas(this.config.optimizingMinimumAgeHours, this.config.optimizingTimeWindowHours, constants_1.Time.hours.toMilliseconds);
+        const { startDelta, endDelta } = (0, workflow_history_compaction_utils_1.getCompactionWindowDeltas)(this.config.optimizingMinimumAgeHours, this.config.optimizingTimeWindowHours, constants_1.Time.hours.toMilliseconds);
         try {
-            await this.compactHistories(startDelta, endDelta, [n8n_workflow_1.RULES.mergeAdditiveChanges], [n8n_workflow_1.SKIP_RULES.makeSkipTimeDifference(20 * 60 * 1000)], signal);
+            await this.compactHistories(new Date(), startDelta, endDelta, [n8n_workflow_1.RULES.mergeAdditiveChanges], [n8n_workflow_1.SKIP_RULES.makeSkipTimeDifference(20 * 60 * 1000)], signal);
         }
         finally {
             this.isOptimizingHistories = false;
         }
     }
-    async compactHistories(startDeltaMs, endDeltaMs, rules, skipRules, signal, metaData = {}) {
+    startOfToday() {
+        return luxon_1.DateTime.now().setZone(this.globalConfig.generic.timezone).startOf('day').toJSDate();
+    }
+    async compactHistories(anchor, startDeltaMs, endDeltaMs, rules, skipRules, signal, metaData = {}) {
         const compactionStartTime = Date.now();
-        const startDate = new Date(compactionStartTime - startDeltaMs);
-        const endDate = new Date(compactionStartTime - endDeltaMs);
+        const startDate = new Date(anchor.getTime() - startDeltaMs);
+        const endDate = new Date(anchor.getTime() - endDeltaMs);
         const startIso = startDate.toISOString();
         const endIso = endDate.toISOString();
         this.logger.debug('Starting workflow history compaction', {

package/dist/services/pruning/workflow-history-compaction.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-history-compaction.service.js","sourceRoot":"","sources":["../../../src/services/pruning/workflow-history-compaction.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workflow-history-compaction.service.js","sourceRoot":"","sources":["../../../src/services/pruning/workflow-history-compaction.service.ts"],"names":[],"mappings":"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"}

package/dist/services/pruning/workflow-history-compaction.utils.d.ts

@@ -0,0 +1,6 @@
+import type { GlobalConfig, WorkflowHistoryCompactionConfig } from '@n8n/config';
+export declare function getCompactionWindowDeltas(minimumAge: number, timeWindow: number, unitMs: number): {
+    startDelta: number;
+    endDelta: number;
+};
+export declare function isTrimmingEnabled(workflowHistory: GlobalConfig['workflowHistory'], compaction: WorkflowHistoryCompactionConfig): boolean;

package/dist/services/pruning/workflow-history-compaction.utils.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCompactionWindowDeltas = getCompactionWindowDeltas;
+exports.isTrimmingEnabled = isTrimmingEnabled;
+const constants_1 = require("@n8n/constants");
+function getCompactionWindowDeltas(minimumAge, timeWindow, unitMs) {
+    return { startDelta: (minimumAge + timeWindow) * unitMs, endDelta: minimumAge * unitMs };
+}
+function isTrimmingEnabled(workflowHistory, compaction) {
+    return (workflowHistory.pruneTime === -1 ||
+        workflowHistory.pruneTime * constants_1.Time.hours.toMilliseconds >=
+            compaction.trimmingMinimumAgeDays * constants_1.Time.days.toMilliseconds);
+}
+//# sourceMappingURL=workflow-history-compaction.utils.js.map

package/dist/services/pruning/workflow-history-compaction.utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workflow-history-compaction.utils.js","sourceRoot":"","sources":["../../../src/services/pruning/workflow-history-compaction.utils.ts"],"names":[],"mappings":";;;;AACA,8CAAsC;AAEtC,mCAA0C,UAAkB,EAAE,UAAkB,EAAE,MAAc;IAC/F,OAAO,EAAE,UAAU,EAAE,CAAC,UAAU,GAAG,UAAU,CAAC,GAAG,MAAM,EAAE,QAAQ,EAAE,UAAU,GAAG,MAAM,EAAE,CAAC;AAC1F,CAAC;AAGD,2BACC,eAAgD,EAChD,UAA2C;IAE3C,OAAO,CACN,eAAe,CAAC,SAAS,KAAK,CAAC,CAAC;QAChC,eAAe,CAAC,SAAS,GAAG,gBAAI,CAAC,KAAK,CAAC,cAAc;YACpD,UAAU,CAAC,sBAAsB,GAAG,gBAAI,CAAC,IAAI,CAAC,cAAc,CAC7D,CAAC;AACH,CAAC"}

package/dist/services/pruning/workflow-history-pruning.task.d.ts

@@ -1,12 +1,15 @@
+import { DatabaseConfig } from '@n8n/config';
 import { SystemTask } from '@n8n/decorators';
 import type { SystemTaskEffects, SystemTaskPlacement, SystemTaskSchedule } from '@n8n/decorators';
 import { WorkflowHistoryManager } from '../../workflows/workflow-history/workflow-history-manager';
 export declare class WorkflowHistoryPruningTask implements SystemTask {
+    private readonly databaseConfig;
     private readonly workflowHistoryManager;
     readonly name = "workflow-history-pruning";
     readonly schedule: SystemTaskSchedule;
     readonly effects: SystemTaskEffects;
     readonly placement: SystemTaskPlacement;
-    constructor(workflowHistoryManager: WorkflowHistoryManager);
+    readonly timeoutSeconds: number;
+    constructor(databaseConfig: DatabaseConfig, workflowHistoryManager: WorkflowHistoryManager);
     run(): Promise<void>;
 }

package/dist/services/pruning/workflow-history-pruning.task.js

@@ -10,11 +10,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkflowHistoryPruningTask = void 0;
+const config_1 = require("@n8n/config");
 const constants_1 = require("@n8n/constants");
 const decorators_1 = require("@n8n/decorators");
 const workflow_history_manager_1 = require("../../workflows/workflow-history/workflow-history-manager");
 let WorkflowHistoryPruningTask = class WorkflowHistoryPruningTask {
-    constructor(workflowHistoryManager) {
+    constructor(databaseConfig, workflowHistoryManager) {
+        this.databaseConfig = databaseConfig;
         this.workflowHistoryManager = workflowHistoryManager;
         this.name = 'workflow-history-pruning';
         this.schedule = (0, decorators_1.intervalFromSeconds)(constants_1.Time.hours.toSeconds);
@@ -24,6 +26,7 @@ let WorkflowHistoryPruningTask = class WorkflowHistoryPruningTask {
             durable: true,
             runOnTakeover: true,
         };
+        this.timeoutSeconds = (0, decorators_1.timeoutAfterLimit)((0, config_1.statementTimeoutSeconds)(this.databaseConfig), 5 * constants_1.Time.minutes.toSeconds);
     }
     async run() {
         await this.workflowHistoryManager.prune();
@@ -32,6 +35,6 @@ let WorkflowHistoryPruningTask = class WorkflowHistoryPruningTask {
 exports.WorkflowHistoryPruningTask = WorkflowHistoryPruningTask;
 exports.WorkflowHistoryPruningTask = WorkflowHistoryPruningTask = __decorate([
     (0, decorators_1.SystemTask)(),
-    __metadata("design:paramtypes", [workflow_history_manager_1.WorkflowHistoryManager])
+    __metadata("design:paramtypes", [config_1.DatabaseConfig, workflow_history_manager_1.WorkflowHistoryManager])
 ], WorkflowHistoryPruningTask);
 //# sourceMappingURL=workflow-history-pruning.task.js.map

package/dist/services/pruning/workflow-history-pruning.task.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-history-pruning.task.js","sourceRoot":"","sources":["../../../src/services/pruning/workflow-history-pruning.task.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAsC;AACtC,gDAAkE;AAGlE,oGAA+F;AAIxF,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IActC,YAA6B,sBAA8C;QAA9C,2BAAsB,GAAtB,sBAAsB,CAAwB;QAblE,SAAI,GAAG,0BAA0B,CAAC;QAElC,aAAQ,GAAuB,IAAA,gCAAmB,EAAC,gBAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAEzE,YAAO,GAAsB,YAAY,CAAC;QAE1C,cAAS,GAAwB;YACzC,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,IAAI;YAEb,aAAa,EAAE,IAAI;SACnB,CAAC;IAE4E,CAAC;IAE/E,KAAK,CAAC,GAAG;QACR,MAAM,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,CAAC;IAC3C,CAAC;CACD,CAAA;;qCAnBY,0BAA0B;IADtC,IAAA,uBAAU,GAAE;qCAeyC,iDAAsB;GAd/D,0BAA0B,CAmBtC"}
+{"version":3,"file":"workflow-history-pruning.task.js","sourceRoot":"","sources":["../../../src/services/pruning/workflow-history-pruning.task.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAAsE;AACtE,8CAAsC;AACtC,gDAAqF;AAGrF,oGAA+F;AAIxF,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IAsBtC,YACkB,cAA8B,EAC9B,sBAA8C;QAD9C,mBAAc,GAAd,cAAc,CAAgB;QAC9B,2BAAsB,GAAtB,sBAAsB,CAAwB;QAvBvD,SAAI,GAAG,0BAA0B,CAAC;QAElC,aAAQ,GAAuB,IAAA,gCAAmB,EAAC,gBAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAEzE,YAAO,GAAsB,YAAY,CAAC;QAE1C,cAAS,GAAwB;YACzC,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,IAAI;YAEb,aAAa,EAAE,IAAI;SACnB,CAAC;QAKO,mBAAc,GAAG,IAAA,8BAAiB,EAC1C,IAAA,gCAAuB,EAAC,IAAI,CAAC,cAAc,CAAC,EAC5C,CAAC,GAAG,gBAAI,CAAC,OAAO,CAAC,SAAS,CAC1B,CAAC;IAKC,CAAC;IAEJ,KAAK,CAAC,GAAG;QACR,MAAM,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,CAAC;IAC3C,CAAC;CACD,CAAA;;qCA9BY,0BAA0B;IADtC,IAAA,uBAAU,GAAE;qCAwBsB,uBAAc,EACN,iDAAsB;GAxBpD,0BAA0B,CA8BtC"}

package/dist/services/role-mapping-proxy.service.d.ts

@@ -0,0 +1,53 @@
+import type { OperationContext, User } from '@n8n/db';
+import type { RoleMappingRule } from '@n8n/inbound-auth';
+export interface RoleResolverContext {
+    $claims: Record<string, unknown>;
+    $oidc?: {
+        idToken: Record<string, unknown>;
+        userInfo: Record<string, unknown>;
+    };
+    $saml?: {
+        attributes: Record<string, unknown>;
+    };
+    $provider: 'oidc' | 'saml' | 'ldap' | 'oauth2';
+    $project?: ProjectInfo;
+}
+export interface RoleMappingConfig {
+    instanceRoleRules: RoleMappingRule[];
+    projectRoleRules: RoleMappingRule[];
+    fallbackInstanceRole: string;
+}
+export interface ResolvedInstanceRole {
+    role: string;
+    matchedRuleId: string | null;
+    expression: string | null;
+    isFallback: boolean;
+}
+export interface ResolvedProjectRole {
+    projectId: string;
+    role: string;
+    matchedRuleId: string;
+    expression: string;
+}
+export interface ResolvedRoles {
+    instanceRole: ResolvedInstanceRole;
+    projectRoles: Map<string, ResolvedProjectRole>;
+}
+export interface ProjectInfo {
+    id: string;
+    name: string;
+    type: 'personal' | 'team';
+    description: string | null;
+}
+export interface RoleMappingProvider {
+    resolveRoles(config: RoleMappingConfig, context: RoleResolverContext, ctx?: OperationContext): Promise<ResolvedRoles>;
+    applyResolvedRoles(user: User, resolved: ResolvedRoles, managed: {
+        instanceRole: boolean;
+        projectRoles: boolean;
+    }): Promise<void>;
+}
+export declare class RoleMappingProxyService {
+    private provider;
+    registerProvider(provider: RoleMappingProvider): void;
+    getProvider(): RoleMappingProvider | null;
+}

package/dist/{modules/favorites/favorite-resource-resolver.registry.js → services/role-mapping-proxy.service.js}

@@ -6,21 +6,21 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FavoriteResourceResolverRegistry = void 0;
+exports.RoleMappingProxyService = void 0;
 const di_1 = require("@n8n/di");
-let FavoriteResourceResolverRegistry = class FavoriteResourceResolverRegistry {
+let RoleMappingProxyService = class RoleMappingProxyService {
     constructor() {
-        this.resolvers = new Map();
+        this.provider = null;
     }
-    register(type, resolver) {
-        this.resolvers.set(type, resolver);
+    registerProvider(provider) {
+        this.provider = provider;
     }
-    get(type) {
-        return this.resolvers.get(type);
+    getProvider() {
+        return this.provider;
     }
 };
-exports.FavoriteResourceResolverRegistry = FavoriteResourceResolverRegistry;
-exports.FavoriteResourceResolverRegistry = FavoriteResourceResolverRegistry = __decorate([
+exports.RoleMappingProxyService = RoleMappingProxyService;
+exports.RoleMappingProxyService = RoleMappingProxyService = __decorate([
     (0, di_1.Service)()
-], FavoriteResourceResolverRegistry);
-//# sourceMappingURL=favorite-resource-resolver.registry.js.map
+], RoleMappingProxyService);
+//# sourceMappingURL=role-mapping-proxy.service.js.map

package/dist/services/role-mapping-proxy.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"role-mapping-proxy.service.js","sourceRoot":"","sources":["../../src/services/role-mapping-proxy.service.ts"],"names":[],"mappings":";;;;;;;;;AACA,gCAAkC;AAyE3B,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAA7B;QACE,aAAQ,GAA+B,IAAI,CAAC;IAUrD,CAAC;IARA,gBAAgB,CAAC,QAA6B;QAC7C,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC1B,CAAC;IAGD,WAAW;QACV,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;CACD,CAAA;;kCAXY,uBAAuB;IADnC,IAAA,YAAO,GAAE;GACG,uBAAuB,CAWnC"}

package/dist/services/token-purposes.d.ts

@@ -10,10 +10,12 @@ export declare const TOKEN_PURPOSES: {
     readonly teamsArmTemplate: 'n8n:teams-arm-template';
     readonly publicApiKey: 'public-api';
     readonly mcpApiKey: 'mcp-server-api';
+    readonly scimApiKey: 'scim-api';
 };
 export type TokenPurpose = keyof typeof TOKEN_PURPOSES;
 export declare const API_KEY_PURPOSES: {
     readonly 'public-api': 'publicApiKey';
     readonly 'mcp-server-api': 'mcpApiKey';
+    readonly 'scim-api': 'scimApiKey';
 };
 export declare const LEGACY_UNBOUND_PURPOSES: Partial<Record<TokenPurpose, (claims: Record<string, unknown>) => boolean>>;

package/dist/services/token-purposes.js

@@ -13,10 +13,12 @@ exports.TOKEN_PURPOSES = {
     teamsArmTemplate: 'n8n:teams-arm-template',
     publicApiKey: 'public-api',
     mcpApiKey: 'mcp-server-api',
+    scimApiKey: 'scim-api',
 };
 exports.API_KEY_PURPOSES = {
     'public-api': 'publicApiKey',
     'mcp-server-api': 'mcpApiKey',
+    'scim-api': 'scimApiKey',
 };
 const isNonEmptyString = (value) => typeof value === 'string' && value.length > 0;
 exports.LEGACY_UNBOUND_PURPOSES = {

package/dist/services/token-purposes.js.map

@@ -1 +1 @@
-{"version":3,"file":"token-purposes.js","sourceRoot":"","sources":["../../src/services/token-purposes.ts"],"names":[],"mappings":";;;AAca,QAAA,cAAc,GAAG;IAC7B,OAAO,EAAE,aAAa;IACtB,MAAM,EAAE,YAAY;IACpB,aAAa,EAAE,oBAAoB;IACnC,WAAW,EAAE,kBAAkB;IAC/B,SAAS,EAAE,gBAAgB;IAC3B,SAAS,EAAE,gBAAgB;IAC3B,YAAY,EAAE,mBAAmB;IACjC,aAAa,EAAE,oBAAoB;IACnC,gBAAgB,EAAE,wBAAwB;IAC1C,YAAY,EAAE,YAAY;IAC1B,SAAS,EAAE,gBAAgB;CAK3B,CAAC;AAoBW,QAAA,gBAAgB,GAAG;IAC/B,YAAY,EAAE,cAAc;IAC5B,gBAAgB,EAAE,WAAW;CAC2B,CAAC;AAE1D,MAAM,gBAAgB,GAAG,CAAC,KAAc,EAAmB,EAAE,CAC5D,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;AAiBlC,QAAA,uBAAuB,GAEhC;IACH,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC;CAC5F,CAAC"}
+{"version":3,"file":"token-purposes.js","sourceRoot":"","sources":["../../src/services/token-purposes.ts"],"names":[],"mappings":";;;AAca,QAAA,cAAc,GAAG;IAC7B,OAAO,EAAE,aAAa;IACtB,MAAM,EAAE,YAAY;IACpB,aAAa,EAAE,oBAAoB;IACnC,WAAW,EAAE,kBAAkB;IAC/B,SAAS,EAAE,gBAAgB;IAC3B,SAAS,EAAE,gBAAgB;IAC3B,YAAY,EAAE,mBAAmB;IACjC,aAAa,EAAE,oBAAoB;IACnC,gBAAgB,EAAE,wBAAwB;IAC1C,YAAY,EAAE,YAAY;IAC1B,SAAS,EAAE,gBAAgB;IAC3B,UAAU,EAAE,UAAU;CAMtB,CAAC;AAoBW,QAAA,gBAAgB,GAAG;IAC/B,YAAY,EAAE,cAAc;IAC5B,gBAAgB,EAAE,WAAW;IAC7B,UAAU,EAAE,YAAY;CACgC,CAAC;AAE1D,MAAM,gBAAgB,GAAG,CAAC,KAAc,EAAmB,EAAE,CAC5D,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;AAiBlC,QAAA,uBAAuB,GAEhC;IACH,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC;CAC5F,CAAC"}