n8n 2.29.7 → 2.30.0

package/dist/instance-settings-loader/loaders/community-packages.instance-settings-loader.js

@@ -14,7 +14,7 @@ const backend_common_1 = require("@n8n/backend-common");
 const config_1 = require("@n8n/config");
 const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
-const n8n_workflow_1 = require("n8n-workflow");
+const ensure_error_1 = require("@n8n/utils/errors/ensure-error");
 const zod_1 = require("zod");
 const community_node_types_service_1 = require("../../modules/community-packages/community-node-types.service");
 const community_packages_config_1 = require("../../modules/community-packages/community-packages.config");
@@ -71,7 +71,7 @@ let CommunityPackagesInstanceSettingsLoader = class CommunityPackagesInstanceSet
                 changed = true;
             }
             catch (error) {
-                this.logger.error(`Failed to install community package ${formatRef(item)} from env: ${(0, n8n_workflow_1.ensureError)(error).message}`);
+                this.logger.error(`Failed to install community package ${formatRef(item)} from env: ${(0, ensure_error_1.ensureError)(error).message}`);
             }
         }
         for (const { env, installed: existing } of toUpdate) {
@@ -81,7 +81,7 @@ let CommunityPackagesInstanceSettingsLoader = class CommunityPackagesInstanceSet
                 changed = true;
             }
             catch (error) {
-                this.logger.error(`Failed to update community package '${env.name}' to ${env.version} from env: ${(0, n8n_workflow_1.ensureError)(error).message}`);
+                this.logger.error(`Failed to update community package '${env.name}' to ${env.version} from env: ${(0, ensure_error_1.ensureError)(error).message}`);
             }
         }
         for (const pkg of toRemove) {
@@ -99,7 +99,7 @@ let CommunityPackagesInstanceSettingsLoader = class CommunityPackagesInstanceSet
                 changed = true;
             }
             catch (error) {
-                this.logger.error(`Failed to remove community package '${packageName}' that is not declared in env: ${(0, n8n_workflow_1.ensureError)(error).message}`);
+                this.logger.error(`Failed to remove community package '${packageName}' that is not declared in env: ${(0, ensure_error_1.ensureError)(error).message}`);
             }
         }
         return changed ? 'created' : 'skipped';
@@ -112,7 +112,7 @@ let CommunityPackagesInstanceSettingsLoader = class CommunityPackagesInstanceSet
             return await this.workflowRepository.findWorkflowsWithNodeType(nodeTypes);
         }
         catch (error) {
-            this.logger.warn(`Failed to check workflows referencing community package '${pkg.packageName}' before removal`, { packageName: pkg.packageName, error: (0, n8n_workflow_1.ensureError)(error) });
+            this.logger.warn(`Failed to check workflows referencing community package '${pkg.packageName}' before removal`, { packageName: pkg.packageName, error: (0, ensure_error_1.ensureError)(error) });
             return [];
         }
     }
@@ -147,7 +147,7 @@ let CommunityPackagesInstanceSettingsLoader = class CommunityPackagesInstanceSet
             vetted = await this.communityNodeTypesService.findVetted(item.name);
         }
         catch (error) {
-            this.logger.warn(`Failed to look up vetted checksum for community package '${item.name}': ${(0, n8n_workflow_1.ensureError)(error).message}`);
+            this.logger.warn(`Failed to look up vetted checksum for community package '${item.name}': ${(0, ensure_error_1.ensureError)(error).message}`);
         }
         let resolvedVersion = item.version;
         let checksum;

package/dist/instance-settings-loader/loaders/community-packages.instance-settings-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"community-packages.instance-settings-loader.js","sourceRoot":"","sources":["../../../src/instance-settings-loader/loaders/community-packages.instance-settings-loader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"community-packages.instance-settings-loader.js","sourceRoot":"","sources":["../../../src/instance-settings-loader/loaders/community-packages.instance-settings-loader.ts"],"names":[],"mappings":"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"}

package/dist/interfaces.d.ts

@@ -1,7 +1,8 @@
 import type { ICredentialsBase, IExecutionBase, IExecutionDb, ITagBase, IWorkflowDb } from '@n8n/db';
 import type { AssignableGlobalRole } from '@n8n/permissions';
+import type { IDeferredPromise } from '@n8n/utils/promise/deferred-promise';
 import type { Application, Response } from 'express';
-import type { ExecutionError, ICredentialDataDecryptedObject, ICredentialsDecrypted, IDeferredPromise, IExecuteResponsePromiseData, IRun, ITelemetryTrackProperties, IWorkflowBase, CredentialLoadingDetails, WorkflowExecuteMode, ExecutionStatus, ExecutionSummary, IWorkflowExecutionDataProcess, IExecutionContext, WorkflowExecutionSource } from 'n8n-workflow';
+import type { ExecutionError, ICredentialDataDecryptedObject, ICredentialsDecrypted, IExecuteResponsePromiseData, IRun, ITelemetryTrackProperties, IWorkflowBase, CredentialLoadingDetails, WorkflowExecuteMode, ExecutionStatus, ExecutionSummary, IWorkflowExecutionDataProcess, IExecutionContext, WorkflowExecutionSource } from 'n8n-workflow';
 import type PCancelable from 'p-cancelable';
 import type { ActiveWorkflowManager } from './active-workflow-manager';
 import type { ExternalHooks } from './external-hooks';

package/dist/license/license.service.js

@@ -15,7 +15,7 @@ const backend_network_1 = require("@n8n/backend-network");
 const constants_1 = require("@n8n/constants");
 const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
-const n8n_workflow_1 = require("n8n-workflow");
+const ensure_error_1 = require("@n8n/utils/errors/ensure-error");
 const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
 const license_eula_required_error_1 = require("../errors/response-errors/license-eula-required.error");
 const event_service_1 = require("../events/event.service");
@@ -102,7 +102,7 @@ let LicenseService = class LicenseService {
                 throw new bad_request_error_1.BadRequestError('Failed to register community edition: ' + errorMsg);
             }
             else {
-                this.logger.error('Failed to register community edition', { error: (0, n8n_workflow_1.ensureError)(e) });
+                this.logger.error('Failed to register community edition', { error: (0, ensure_error_1.ensureError)(e) });
                 throw new bad_request_error_1.BadRequestError('Failed to register community edition');
             }
         }
@@ -128,7 +128,7 @@ let LicenseService = class LicenseService {
                     eulaUrl: e.info.eula.uri,
                 });
             }
-            const message = this.mapErrorMessage((0, n8n_workflow_1.ensureError)(e), 'activate');
+            const message = this.mapErrorMessage((0, ensure_error_1.ensureError)(e), 'activate');
             throw new bad_request_error_1.BadRequestError(message);
         }
     }
@@ -152,7 +152,7 @@ let LicenseService = class LicenseService {
             await this.license.renew();
         }
         catch (e) {
-            const message = this.mapErrorMessage((0, n8n_workflow_1.ensureError)(e), 'renew');
+            const message = this.mapErrorMessage((0, ensure_error_1.ensureError)(e), 'renew');
             this.eventService.emit('license-renewal-attempted', { success: false });
             throw new bad_request_error_1.BadRequestError(message);
         }

package/dist/license/license.service.js.map

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

package/dist/load-nodes-and-credentials.js

@@ -49,10 +49,11 @@ exports.LoadNodesAndCredentials = void 0;
 const backend_common_1 = require("@n8n/backend-common");
 const config_1 = require("@n8n/config");
 const di_1 = require("@n8n/di");
-const utils_1 = require("@n8n/utils");
+const is_windows_file_path_1 = require("@n8n/utils/files/is-windows-file-path");
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const promises_1 = __importDefault(require("fs/promises"));
 const n8n_core_1 = require("n8n-core");
+const ensure_error_1 = require("@n8n/utils/errors/ensure-error");
 const n8n_workflow_1 = require("n8n-workflow");
 const path_1 = __importDefault(require("path"));
 const picocolors_1 = __importDefault(require("picocolors"));
@@ -194,7 +195,7 @@ let LoadNodesAndCredentials = class LoadNodesAndCredentials {
             }
             catch (error) {
                 this.logger.error(`Failed to load package "${loader.packageName}"`, {
-                    error: (0, n8n_workflow_1.ensureError)(error),
+                    error: (0, ensure_error_1.ensureError)(error),
                 });
                 this.errorReporter.error(error, { extra: { packageName: loader.packageName } });
             }
@@ -265,13 +266,13 @@ let LoadNodesAndCredentials = class LoadNodesAndCredentials {
             return path_1.default.resolve(loader.directory, iconPath);
         };
         const resolvePathCustom = (path) => {
-            if ((0, utils_1.isWindowsFilePath)(path))
+            if ((0, is_windows_file_path_1.isWindowsFilePath)(path))
                 return path;
             return path.startsWith('/') ? path : '/' + path;
         };
         const pathPrefix = `/icons/${packageName}/`;
         const urlFilePath = url.substring(pathPrefix.length);
-        if (isCustom && !(0, utils_1.isWindowsFilePath)(urlFilePath)) {
+        if (isCustom && !(0, is_windows_file_path_1.isWindowsFilePath)(urlFilePath)) {
             const relativeFilePath = resolvePath(urlFilePath);
             if ((0, backend_common_1.isContainedWithin)(loader.directory, relativeFilePath)) {
                 return relativeFilePath;

package/dist/load-nodes-and-credentials.js.map

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

package/dist/metrics/prometheus/active-workflow-metrics.service.js

@@ -19,6 +19,7 @@ const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const prom_client_1 = __importDefault(require("prom-client"));
 const cache_service_1 = require("../../services/cache/cache.service");
+const cached_metric_query_1 = require("./cached-metric-query");
 let PrometheusActiveWorkflowMetricsService = class PrometheusActiveWorkflowMetricsService {
     constructor(config, workflowRepository, cacheService) {
         this.config = config;
@@ -29,24 +30,18 @@ let PrometheusActiveWorkflowMetricsService = class PrometheusActiveWorkflowMetri
         return true;
     }
     init() {
-        const workflowRepository = this.workflowRepository;
-        const cacheService = this.cacheService;
-        const cacheKey = 'metrics:active-workflow-count';
         const cacheTtl = this.config.activeWorkflowCountInterval * constants_1.Time.seconds.toMilliseconds;
+        const query = new cached_metric_query_1.CachedMetricQuery({
+            cacheService: this.cacheService,
+            cacheKey: 'metrics:active-workflow-count:v2',
+            ttlMs: cacheTtl,
+            query: async () => await this.workflowRepository.getActiveCount(),
+        });
         new prom_client_1.default.Gauge({
             name: `${this.config.prefix}active_workflow_count`,
             help: 'Total number of active workflows.',
             async collect() {
-                const value = await cacheService.get(cacheKey);
-                const numericValue = value !== undefined ? parseInt(value, 10) : undefined;
-                if (numericValue !== undefined && Number.isFinite(numericValue)) {
-                    this.set(numericValue);
-                }
-                else {
-                    const activeWorkflowCount = await workflowRepository.getActiveCount();
-                    await cacheService.set(cacheKey, activeWorkflowCount.toString(), cacheTtl);
-                    this.set(activeWorkflowCount);
-                }
+                this.set(await query.get());
             },
         });
     }

package/dist/metrics/prometheus/active-workflow-metrics.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"active-workflow-metrics.service.js","sourceRoot":"","sources":["../../../src/metrics/prometheus/active-workflow-metrics.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wCAAsD;AACtD,8CAAsC;AACtC,gCAA6C;AAC7C,gCAAkC;AAClC,8DAAqC;AAErC,kEAA8D;AAUvD,IAAM,sCAAsC,GAA5C,MAAM,sCAAsC;IAClD,YACkB,MAA+B,EAC/B,kBAAsC,EACtC,YAA0B;QAF1B,WAAM,GAAN,MAAM,CAAyB;QAC/B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,IAAI,OAAO;QACV,OAAO,IAAI,CAAC;IACb,CAAC;IAED,IAAI;QACH,MAAM,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC;QACnD,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACvC,MAAM,QAAQ,GAAG,+BAA+B,CAAC;QACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,2BAA2B,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;QAEvF,IAAI,qBAAU,CAAC,KAAK,CAAC;YACpB,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,uBAAuB;YAClD,IAAI,EAAE,mCAAmC;YACzC,KAAK,CAAC,OAAO;gBACZ,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,GAAG,CAAS,QAAQ,CAAC,CAAC;gBACvD,MAAM,YAAY,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBAE3E,IAAI,YAAY,KAAK,SAAS,IAAI,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;oBACjE,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBACxB,CAAC;qBAAM,CAAC;oBACP,MAAM,mBAAmB,GAAG,MAAM,kBAAkB,CAAC,cAAc,EAAE,CAAC;oBACtE,MAAM,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,mBAAmB,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;oBAE3E,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;gBAC/B,CAAC;YACF,CAAC;SACD,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AAnCY,wFAAsC;iDAAtC,sCAAsC;IADlD,IAAA,YAAO,GAAE;qCAGiB,gCAAuB;QACX,uBAAkB;QACxB,4BAAY;GAJhC,sCAAsC,CAmClD"}
+{"version":3,"file":"active-workflow-metrics.service.js","sourceRoot":"","sources":["../../../src/metrics/prometheus/active-workflow-metrics.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wCAAsD;AACtD,8CAAsC;AACtC,gCAA6C;AAC7C,gCAAkC;AAClC,8DAAqC;AAErC,kEAA8D;AAG9D,+DAA0D;AAQnD,IAAM,sCAAsC,GAA5C,MAAM,sCAAsC;IAClD,YACkB,MAA+B,EAC/B,kBAAsC,EACtC,YAA0B;QAF1B,WAAM,GAAN,MAAM,CAAyB;QAC/B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,IAAI,OAAO;QACV,OAAO,IAAI,CAAC;IACb,CAAC;IAED,IAAI;QACH,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,2BAA2B,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;QACvF,MAAM,KAAK,GAAG,IAAI,uCAAiB,CAAS;YAC3C,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,QAAQ,EAAE,kCAAkC;YAC5C,KAAK,EAAE,QAAQ;YACf,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE;SACjE,CAAC,CAAC;QAEH,IAAI,qBAAU,CAAC,KAAK,CAAC;YACpB,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,uBAAuB;YAClD,IAAI,EAAE,mCAAmC;YACzC,KAAK,CAAC,OAAO;gBACZ,IAAI,CAAC,GAAG,CAAC,MAAM,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;YAC7B,CAAC;SACD,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AA5BY,wFAAsC;iDAAtC,sCAAsC;IADlD,IAAA,YAAO,GAAE;qCAGiB,gCAAuB;QACX,uBAAkB;QACxB,4BAAY;GAJhC,sCAAsC,CA4BlD"}

package/dist/metrics/prometheus/cached-metric-query.d.ts

@@ -0,0 +1,19 @@
+import type { JsonValue } from 'n8n-workflow';
+import type { CacheService } from '../../services/cache/cache.service';
+type CachedMetricQueryOpts<T extends JsonValue> = {
+    cacheService: CacheService;
+    cacheKey: string;
+    ttlMs: number;
+    query: () => Promise<T>;
+};
+export declare class CachedMetricQuery<T extends JsonValue> {
+    private readonly cacheService;
+    private readonly cacheKey;
+    private readonly ttlMs;
+    private readonly query;
+    private inFlight;
+    constructor({ cacheService, cacheKey, ttlMs, query }: CachedMetricQueryOpts<T>);
+    get(): Promise<T>;
+    private load;
+}
+export {};

package/dist/metrics/prometheus/cached-metric-query.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CachedMetricQuery = void 0;
+class CachedMetricQuery {
+    constructor({ cacheService, cacheKey, ttlMs, query }) {
+        this.inFlight = null;
+        this.cacheService = cacheService;
+        this.cacheKey = cacheKey;
+        this.ttlMs = ttlMs;
+        this.query = query;
+    }
+    async get() {
+        this.inFlight ??= this.load().finally(() => {
+            this.inFlight = null;
+        });
+        return await this.inFlight;
+    }
+    async load() {
+        const cached = await this.cacheService.get(this.cacheKey);
+        if (cached !== undefined)
+            return cached;
+        const value = await this.query();
+        await this.cacheService.set(this.cacheKey, value, this.ttlMs);
+        return value;
+    }
+}
+exports.CachedMetricQuery = CachedMetricQuery;
+//# sourceMappingURL=cached-metric-query.js.map

package/dist/metrics/prometheus/cached-metric-query.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cached-metric-query.js","sourceRoot":"","sources":["../../../src/metrics/prometheus/cached-metric-query.ts"],"names":[],"mappings":";;;AAgBA,MAAa,iBAAiB;IAQ7B,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAA4B;QAFtE,aAAQ,GAAsB,IAAI,CAAC;QAG1C,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,GAAG;QACR,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;YAC1C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACtB,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC;IAC5B,CAAC;IAEO,KAAK,CAAC,IAAI;QAGjB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAI,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC7D,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO,MAAM,CAAC;QAExC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACjC,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9D,OAAO,KAAK,CAAC;IACd,CAAC;CACD;AAhCD,8CAgCC"}

package/dist/metrics/prometheus/instance-ai-metrics.service.js

@@ -71,9 +71,11 @@ let PrometheusInstanceAiMetricsService = class PrometheusInstanceAiMetricsServic
             },
         });
         this.eventService.on('instance-ai-run-finished', ({ status, durationMs, model, toolCalls, toolErrors, usage }) => {
-            runsTotal.inc({ status, model }, 1);
-            if (durationMs !== undefined) {
-                runDurationHistogram.observe({ status }, durationMs / 1000);
+            if (status !== 'suspended') {
+                runsTotal.inc({ status, model }, 1);
+                if (durationMs !== undefined) {
+                    runDurationHistogram.observe({ status }, durationMs / 1000);
+                }
             }
             if (toolCalls > 0)
                 toolCallsTotal.inc(toolCalls);

package/dist/metrics/prometheus/instance-ai-metrics.service.js.map

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

package/dist/metrics/prometheus/prometheus.service.d.ts

@@ -18,12 +18,13 @@ import { PrometheusVersionMetricsService } from './version-metrics.service';
 import { PrometheusWebhookAndFormMetricsService } from './webhook-and-form-metrics.service';
 import { PrometheusWorkflowExecutionDurationMetricsService } from './workflow-execution-duration-metrics.service';
 import { PrometheusWorkflowInfoMetricsService } from './workflow-info-metrics.service';
+import { PrometheusWorkflowPublicationMetricsService } from './workflow-publication-metrics.service';
 import { PrometheusWorkflowStatisticsMetricsService } from './workflow-statistics-metrics.service';
 export declare class PrometheusMetricsService {
     private initialized;
     private readonly logger;
     private readonly collectors;
-    constructor(logger: Logger, cache: PrometheusCacheMetricsService, eventBus: PrometheusEventBusMetricsService, queue: PrometheusQueueMetricsService, route: PrometheusRouteMetricsService, roleInstance: PrometheusInstanceRoleMetricsService, activeWorkflow: PrometheusActiveWorkflowMetricsService, workflowExecutionDuration: PrometheusWorkflowExecutionDurationMetricsService, workflowStatistics: PrometheusWorkflowStatisticsMetricsService, executionData: PrometheusExecutionDataMetricsService, pss: PrometheusPssMetricsService, version: PrometheusVersionMetricsService, defaultMetrics: PrometheusDefaultMetricsService, tokenExchange: PrometheusTokenExchangeMetricsService, ssrf: PrometheusSsrfMetricsService, dnsCache: PrometheusDnsCacheMetricsService, webhook: PrometheusWebhookAndFormMetricsService, workflowInfo: PrometheusWorkflowInfoMetricsService, instanceAi: PrometheusInstanceAiMetricsService, dbPool: PrometheusDbPoolMetricsService);
+    constructor(logger: Logger, cache: PrometheusCacheMetricsService, eventBus: PrometheusEventBusMetricsService, queue: PrometheusQueueMetricsService, route: PrometheusRouteMetricsService, roleInstance: PrometheusInstanceRoleMetricsService, activeWorkflow: PrometheusActiveWorkflowMetricsService, workflowExecutionDuration: PrometheusWorkflowExecutionDurationMetricsService, workflowStatistics: PrometheusWorkflowStatisticsMetricsService, executionData: PrometheusExecutionDataMetricsService, pss: PrometheusPssMetricsService, version: PrometheusVersionMetricsService, defaultMetrics: PrometheusDefaultMetricsService, tokenExchange: PrometheusTokenExchangeMetricsService, ssrf: PrometheusSsrfMetricsService, dnsCache: PrometheusDnsCacheMetricsService, webhook: PrometheusWebhookAndFormMetricsService, workflowInfo: PrometheusWorkflowInfoMetricsService, instanceAi: PrometheusInstanceAiMetricsService, dbPool: PrometheusDbPoolMetricsService, workflowPublication: PrometheusWorkflowPublicationMetricsService);
     init(app: express.Application): void;
     private initCollectors;
     private mountMetricsEndpoint;

package/dist/metrics/prometheus/prometheus.service.js

@@ -34,9 +34,10 @@ const version_metrics_service_1 = require("./version-metrics.service");
 const webhook_and_form_metrics_service_1 = require("./webhook-and-form-metrics.service");
 const workflow_execution_duration_metrics_service_1 = require("./workflow-execution-duration-metrics.service");
 const workflow_info_metrics_service_1 = require("./workflow-info-metrics.service");
+const workflow_publication_metrics_service_1 = require("./workflow-publication-metrics.service");
 const workflow_statistics_metrics_service_1 = require("./workflow-statistics-metrics.service");
 let PrometheusMetricsService = class PrometheusMetricsService {
-    constructor(logger, cache, eventBus, queue, route, roleInstance, activeWorkflow, workflowExecutionDuration, workflowStatistics, executionData, pss, version, defaultMetrics, tokenExchange, ssrf, dnsCache, webhook, workflowInfo, instanceAi, dbPool) {
+    constructor(logger, cache, eventBus, queue, route, roleInstance, activeWorkflow, workflowExecutionDuration, workflowStatistics, executionData, pss, version, defaultMetrics, tokenExchange, ssrf, dnsCache, webhook, workflowInfo, instanceAi, dbPool, workflowPublication) {
         this.initialized = false;
         this.logger = logger.scoped('metrics');
         this.collectors = [
@@ -59,6 +60,7 @@ let PrometheusMetricsService = class PrometheusMetricsService {
             workflowInfo,
             instanceAi,
             dbPool,
+            workflowPublication,
         ];
     }
     init(app) {
@@ -112,6 +114,7 @@ exports.PrometheusMetricsService = PrometheusMetricsService = __decorate([
         webhook_and_form_metrics_service_1.PrometheusWebhookAndFormMetricsService,
         workflow_info_metrics_service_1.PrometheusWorkflowInfoMetricsService,
         instance_ai_metrics_service_1.PrometheusInstanceAiMetricsService,
-        db_pool_metrics_service_1.PrometheusDbPoolMetricsService])
+        db_pool_metrics_service_1.PrometheusDbPoolMetricsService,
+        workflow_publication_metrics_service_1.PrometheusWorkflowPublicationMetricsService])
 ], PrometheusMetricsService);
 //# sourceMappingURL=prometheus.service.js.map

package/dist/metrics/prometheus/prometheus.service.js.map

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

package/dist/metrics/prometheus/workflow-info-metrics.service.js

@@ -17,9 +17,9 @@ const config_1 = require("@n8n/config");
 const constants_1 = require("@n8n/constants");
 const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
-const n8n_workflow_1 = require("n8n-workflow");
 const prom_client_1 = __importDefault(require("prom-client"));
 const cache_service_1 = require("../../services/cache/cache.service");
+const cached_metric_query_1 = require("./cached-metric-query");
 let PrometheusWorkflowInfoMetricsService = class PrometheusWorkflowInfoMetricsService {
     constructor(config, workflowRepository, cacheService) {
         this.config = config;
@@ -30,25 +30,20 @@ let PrometheusWorkflowInfoMetricsService = class PrometheusWorkflowInfoMetricsSe
         return this.config.includeWorkflowInfoMetrics;
     }
     init() {
-        const workflowRepository = this.workflowRepository;
-        const cacheService = this.cacheService;
-        const cacheKey = 'metrics:workflow-info';
         const cacheTtl = this.config.workflowInfoMetricInterval * constants_1.Time.seconds.toMilliseconds;
+        const query = new cached_metric_query_1.CachedMetricQuery({
+            cacheService: this.cacheService,
+            cacheKey: 'metrics:workflow-info:v2',
+            ttlMs: cacheTtl,
+            query: async () => await this.workflowRepository.find({ select: ['id', 'name'] }),
+        });
         new prom_client_1.default.Gauge({
             name: `${this.config.prefix}workflow_info`,
             help: 'Map of workflow ID to name.',
             labelNames: ['workflow_id', 'workflow_name'],
             async collect() {
                 this.reset();
-                const cachedValue = await cacheService.get(cacheKey);
-                let workflows;
-                if (cachedValue !== undefined) {
-                    workflows = (0, n8n_workflow_1.jsonParse)(String(cachedValue), { fallbackValue: [] });
-                }
-                else {
-                    workflows = await workflowRepository.find({ select: ['id', 'name'] });
-                    await cacheService.set(cacheKey, JSON.stringify(workflows), cacheTtl);
-                }
+                const workflows = await query.get();
                 for (const { id, name } of workflows) {
                     this.labels({ workflow_id: id, workflow_name: name }).set(1);
                 }

package/dist/metrics/prometheus/workflow-info-metrics.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-info-metrics.service.js","sourceRoot":"","sources":["../../../src/metrics/prometheus/workflow-info-metrics.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wCAAsD;AACtD,8CAAsC;AACtC,gCAA6C;AAC7C,gCAAkC;AAClC,+CAAyC;AACzC,8DAAqC;AAErC,kEAA8D;AAWvD,IAAM,oCAAoC,GAA1C,MAAM,oCAAoC;IAChD,YACkB,MAA+B,EAC/B,kBAAsC,EACtC,YAA0B;QAF1B,WAAM,GAAN,MAAM,CAAyB;QAC/B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC;IAC/C,CAAC;IAED,IAAI;QACH,MAAM,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC;QACnD,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACvC,MAAM,QAAQ,GAAG,uBAAuB,CAAC;QACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,0BAA0B,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;QAEtF,IAAI,qBAAU,CAAC,KAAK,CAAC;YACpB,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,eAAe;YAC1C,IAAI,EAAE,6BAA6B;YACnC,UAAU,EAAE,CAAC,aAAa,EAAE,eAAe,CAAC;YAC5C,KAAK,CAAC,OAAO;gBACZ,IAAI,CAAC,KAAK,EAAE,CAAC;gBAEb,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,GAAG,CAAS,QAAQ,CAAC,CAAC;gBAE7D,IAAI,SAA8C,CAAC;gBAEnD,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;oBAC/B,SAAS,GAAG,IAAA,wBAAS,EAAC,MAAM,CAAC,WAAW,CAAC,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,CAAC;gBACnE,CAAC;qBAAM,CAAC;oBACP,SAAS,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;oBACtE,MAAM,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC;gBACvE,CAAC;gBAED,KAAK,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,SAAS,EAAE,CAAC;oBACtC,IAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC9D,CAAC;YACF,CAAC;SACD,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AAzCY,oFAAoC;+CAApC,oCAAoC;IADhD,IAAA,YAAO,GAAE;qCAGiB,gCAAuB;QACX,uBAAkB;QACxB,4BAAY;GAJhC,oCAAoC,CAyChD"}
+{"version":3,"file":"workflow-info-metrics.service.js","sourceRoot":"","sources":["../../../src/metrics/prometheus/workflow-info-metrics.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wCAAsD;AACtD,8CAAsC;AACtC,gCAA6C;AAC7C,gCAAkC;AAClC,8DAAqC;AAErC,kEAA8D;AAG9D,+DAA0D;AASnD,IAAM,oCAAoC,GAA1C,MAAM,oCAAoC;IAChD,YACkB,MAA+B,EAC/B,kBAAsC,EACtC,YAA0B;QAF1B,WAAM,GAAN,MAAM,CAAyB;QAC/B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC;IAC/C,CAAC;IAED,IAAI;QACH,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,0BAA0B,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;QACtF,MAAM,KAAK,GAAG,IAAI,uCAAiB,CAAsC;YACxE,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,QAAQ,EAAE,0BAA0B;YACpC,KAAK,EAAE,QAAQ;YACf,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;SACjF,CAAC,CAAC;QAEH,IAAI,qBAAU,CAAC,KAAK,CAAC;YACpB,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,eAAe;YAC1C,IAAI,EAAE,6BAA6B;YACnC,UAAU,EAAE,CAAC,aAAa,EAAE,eAAe,CAAC;YAC5C,KAAK,CAAC,OAAO;gBACZ,IAAI,CAAC,KAAK,EAAE,CAAC;gBAEb,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,CAAC;gBACpC,KAAK,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,SAAS,EAAE,CAAC;oBACtC,IAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC9D,CAAC;YACF,CAAC;SACD,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AAlCY,oFAAoC;+CAApC,oCAAoC;IADhD,IAAA,YAAO,GAAE;qCAGiB,gCAAuB;QACX,uBAAkB;QACxB,4BAAY;GAJhC,oCAAoC,CAkChD"}

package/dist/metrics/prometheus/workflow-publication-metrics.service.d.ts

@@ -0,0 +1,21 @@
+import { PrometheusMetricsConfig, WorkflowsConfig } from '@n8n/config';
+import { WorkflowPublicationOutboxRepository } from '@n8n/db';
+import { InstanceSettings } from 'n8n-core';
+import { EventService } from '../../events/event.service';
+import { CacheService } from '../../services/cache/cache.service';
+import type { PrometheusMetricsCollector } from './base';
+export declare class PrometheusWorkflowPublicationMetricsService implements PrometheusMetricsCollector {
+    private readonly config;
+    private readonly workflowsConfig;
+    private readonly instanceSettings;
+    private readonly eventService;
+    private readonly outboxRepository;
+    private readonly cacheService;
+    constructor(config: PrometheusMetricsConfig, workflowsConfig: WorkflowsConfig, instanceSettings: InstanceSettings, eventService: EventService, outboxRepository: WorkflowPublicationOutboxRepository, cacheService: CacheService);
+    get enabled(): boolean;
+    init(): void;
+    private initOutboxGauges;
+    private initRecordOutcomeMetrics;
+    private initTriggerMetrics;
+    private initCleanupMetrics;
+}