npm - n8n - Versions diffs - 2.42.0 → 2.42.1 - Mend

n8n 2.42.0 → 2.42.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (69) hide show

package/dist/modules/instance-reporting.ee/instance-reporting.service.js CHANGED Viewed

@@ -21,8 +21,8 @@ const n8n_workflow_1 = require("n8n-workflow");
 const constants_2 = require("../../constants");
 const event_service_1 = require("../../events/event.service");
 const license_1 = require("../../license");
+const insights_config_1 = require("../../modules/insights/insights.config");
 const insights_service_1 = require("../../modules/insights/insights.service");
-const ownership_service_1 = require("../../services/ownership.service");
 const instance_monitoring_report_repository_1 = require("./database/repositories/instance-monitoring-report.repository");
 const instance_reporting_config_1 = require("./instance-reporting.config");
 const instance_reporting_constants_1 = require("./instance-reporting.constants");
@@ -46,14 +46,13 @@ const SKIP_MESSAGES = {
     'slot-passed': 'Giving up on the instance report because its slot has passed',
     rejected: 'Giving up on the instance report because the receiver rejected its payload',
 };
-const MAX_BACKFILL_DAYS = 30;
 let InstanceReportingService = class InstanceReportingService {
-    constructor(config, reportRepository, insightsService, instanceSettings, ownershipService, licenseMetricsRepository, license, logger, eventService, outboundHttp) {
+    constructor(config, reportRepository, insightsService, insightsConfig, instanceSettings, licenseMetricsRepository, license, logger, eventService, outboundHttp) {
         this.config = config;
         this.reportRepository = reportRepository;
         this.insightsService = insightsService;
+        this.insightsConfig = insightsConfig;
         this.instanceSettings = instanceSettings;
-        this.ownershipService = ownershipService;
         this.licenseMetricsRepository = licenseMetricsRepository;
         this.license = license;
         this.logger = logger;
@@ -88,11 +87,6 @@ let InstanceReportingService = class InstanceReportingService {
             const days = await this.missedDays(now);
             if (days.length === 0)
                 return;
-            if (days.length > 1) {
-                this.logger.info('Reporting days missed since the last delivered instance report', {
-                    days,
-                });
-            }
             report = await this.reportRepository.createPending(await this.collectDataPoints(days), now);
             if (!report) {
                 throw new InstanceReportAlreadyCreatedError();
@@ -151,30 +145,39 @@ let InstanceReportingService = class InstanceReportingService {
         this.logger.error(SKIP_MESSAGES[reason], { batchId: id, attempts, lastError });
     }
     async missedDays(now) {
+        const yesterday = utcDayBefore(now, 1);
         const lastCoveredDay = await this.reportRepository.findLastCoveredDay();
+        if (lastCoveredDay && lastCoveredDay >= yesterday)
+            return [];
+        const firstDay = minDay(await this.firstOwedDay(lastCoveredDay, yesterday), yesterday);
+        const oldestAllowedDay = utcDayBefore(now, Math.max(1, this.insightsConfig.compactionHourlyToDailyThresholdDays - 1));
         const days = [];
-        for (let back = 1; back <= (lastCoveredDay ? MAX_BACKFILL_DAYS : 1); back++) {
-            const day = utcDayBefore(now, back);
-            if (lastCoveredDay && day <= lastCoveredDay)
-                break;
-            days.unshift(day);
+        for (let day = maxDay(firstDay, oldestAllowedDay); day <= yesterday; day = addUtcDays(day, 1)) {
+            days.push(day);
+        }
+        if (days.length > 1) {
+            this.logger.info(lastCoveredDay
+                ? 'Reporting days missed since the last delivered instance report'
+                : 'Reporting the insights history, since no instance report was delivered yet', { firstDay: days[0], lastDay: days.at(-1), count: days.length });
         }
         return days;
     }
+    async firstOwedDay(lastCoveredDay, yesterday) {
+        const dayAfterCovered = lastCoveredDay ? addUtcDays(lastCoveredDay, 1) : null;
+        if (dayAfterCovered === yesterday)
+            return yesterday;
+        const earliest = await this.insightsService.getEarliestDataDate();
+        const dataStart = earliest ? earliest.toISOString().slice(0, 10) : null;
+        return maxDay(dayAfterCovered ?? dataStart ?? yesterday, dataStart);
+    }
     async collectDataPoints(days) {
-        const startDate = new Date(`${days[0]}T00:00:00.000Z`);
-        const endDate = new Date(new Date(`${days.at(-1)}T00:00:00.000Z`).getTime() + constants_1.Time.days.toMilliseconds);
-        const owner = await this.ownershipService.getInstanceOwner();
-        const [byDay, { productionRootExecutions }] = await Promise.all([
-            this.insightsService.getInsightsByTime({
-                user: owner,
-                startDate,
-                endDate,
-                timeZone: 'UTC',
+        const [totals, { productionRootExecutions }] = await Promise.all([
+            this.insightsService.getDailyExecutionTotals({
+                startDate: new Date(`${days[0]}T00:00:00.000Z`),
+                endDate: new Date(`${days.at(-1)}T00:00:00.000Z`),
             }),
             this.licenseMetricsRepository.getLicenseRenewalMetrics(),
         ]);
-        const totals = new Map(byDay.map((row) => [row.date.slice(0, 10), row.values.total ?? 0]));
         return [
             { kind: 'cumulative', name: 'billableExecutions', value: productionRootExecutions },
             ...days.map((date) => ({
@@ -189,9 +192,18 @@ let InstanceReportingService = class InstanceReportingService {
 exports.InstanceReportingService = InstanceReportingService;
 exports.InstanceReportingService = InstanceReportingService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [instance_reporting_config_1.InstanceReportingConfig, instance_monitoring_report_repository_1.InstanceMonitoringReportRepository, insights_service_1.InsightsService, n8n_core_1.InstanceSettings, ownership_service_1.OwnershipService, db_1.LicenseMetricsRepository, license_1.License, backend_common_1.Logger, event_service_1.EventService, backend_network_1.OutboundHttp])
+    __metadata("design:paramtypes", [instance_reporting_config_1.InstanceReportingConfig, instance_monitoring_report_repository_1.InstanceMonitoringReportRepository, insights_service_1.InsightsService, insights_config_1.InsightsConfig, n8n_core_1.InstanceSettings, db_1.LicenseMetricsRepository, license_1.License, backend_common_1.Logger, event_service_1.EventService, backend_network_1.OutboundHttp])
 ], InstanceReportingService);
 function utcDayBefore(instant, count) {
     return new Date(instant.getTime() - count * constants_1.Time.days.toMilliseconds).toISOString().slice(0, 10);
 }
+function addUtcDays(day, count) {
+    return utcDayBefore(new Date(`${day}T00:00:00.000Z`), -count);
+}
+function maxDay(day, other) {
+    return other && other > day ? other : day;
+}
+function minDay(day, other) {
+    return other < day ? other : day;
+}
 //# sourceMappingURL=instance-reporting.service.js.map

package/dist/modules/instance-reporting.ee/instance-reporting.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"instance-reporting.service.js","sourceRoot":"","sources":["../../../src/modules/instance-reporting.ee/instance-reporting.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAE7C,0DAAoD;AACpD,8CAAsC;AACtC,gCAAmD;AACnD,gCAAkC;AAClC,oDAAgD;AAChD,uCAA4C;AAC5C,+CAAgD;AAEhD,2CAA0C;AAC1C,0DAAsD;AACtD,uCAAoC;AACpC,~~0EAAsE~~;~~AACtE~~,~~oEAAgE~~;~~AAGhE~~,yHAAmH;AACnH,2EAAsE;AACtE,iFAAuE;AAGvE,MAAM,kBAAkB,GAAG,EAAE,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;AAO5D,MAAM,YAAY,GAAG,CAAC,CAAC;AAGvB,MAAM,yBAAyB,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AAEtD,MAAM,2BAA4B,SAAQ,+BAAgB;IACzD,YAAY,UAAkB,EAAE,IAAa;QAC5C,MAAM,MAAM,GAAG,IAAA,oBAAQ,EAAC,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7F,KAAK,CAAC,4CAA4C,UAAU,GAAG,MAAM,EAAE,CAAC,CAAC;IAC1E,CAAC;CACD;AAED,uCAA+C,SAAQ,+BAAgB;IACtE;QACC,KAAK,CAAC,+DAA+D,CAAC,CAAC;IACxE,CAAC;CACD;;AAID,MAAM,aAAa,GAA+B;IACjD,aAAa,EAAE,mEAAmE;IAClF,aAAa,EAAE,8DAA8D;IAC7E,QAAQ,EAAE,4EAA4E;CACtF,CAAC;~~AAUF~~,~~MAAM,iBAAiB,GAAG,EAAE,CAAC;AAOtB,~~IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAGpC,YACkB,MAA+B,EAC/B,gBAAoD,EACpD,eAAgC,EAChC,~~gBAAkC~~,~~EAClC~~,gBAAkC,EAClC,wBAAkD,EAClD,OAAgB,EAChB,MAAc,EACd,YAA0B,EAC3C,YAA0B;sBATT,MAAM;gCACN,gBAAgB;+BAChB,eAAe;~~gCACf~~,~~gBAAgB~~;~~gCAChB~~,gBAAgB;wCAChB,wBAAwB;uBACxB,OAAO;sBACP,MAAM;4BACN,YAAY;QAG7B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;QAEvD,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC,QAAQ,CAAC;YAGjC,oBAAoB,EAAE,QAAQ;YAC9B,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,wBAAwB,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;YAEjE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;gBACf,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,0BAA0B;oBACpD,CAAC,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,0BAA0B,EAAE;oBACpD,CAAC,CAAC,SAAS;aACZ,CAAC;YACF,OAAO,EAAE,kBAAkB;SAC3B,CAAC,CAAC;IACJ,CAAC;IA4BD,KAAK,CAAC,UAAU;QACf,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,0BAA0B;YACzD,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QACpC,IAAI,WAAW,KAAK,EAAE,EAAE,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,gFAAgF,CAChF,CAAC;YACF,OAAO;QACR,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC;QAKvD,IAAI,MAAM,IAAI,MAAM,CAAC,QAAQ,IAAI,YAAY,EAAE,CAAC;YAC/C,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;YAC7E,OAAO;QACR,CAAC;QAED,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YACxC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO;YAE9B,~~IAAI,IAAI,CAAC,~~MAAM,GAAG,~~CAAC,EAAE,CAAC;gBACrB,IAAI,CAAC,~~MAAM,~~CAAC,~~IAAI,CAAC,~~gEAAgE,EAAE;oBAClF,IAAI;iBACJ,CAAC,CAAC;YACJ,CAAC;YAED,MAAM,GAAG,MAAM,IAAI,CAAC,~~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~~MAAM~~,IAAI,~~GAAa~~,EAAE,CAAC;~~QAI1B~~,~~KAAK~~,~~IAAI~~,~~IAAI,~~GAAG,CAAC,~~EAAE~~,IAAI,~~IAAI~~,CAAC,cAAc,CAAC,CAAC,CAAC,~~iBAAiB~~,CAAC,CAAC,CAAC,CAAC,CAAC,~~EAAE~~,IAAI,~~EAAE~~,EAAE,CAAC;~~YAC7E~~,~~MAAM~~,GAAG,GAAG,~~YAAY~~,CAAC,~~GAAG~~,EAAE,~~IAAI~~,CAAC,~~CAAC;YACpC~~,IAAI,~~cAAc~~,~~IAAI~~,GAAG,~~IAAI~~,~~cAAc;gBAAE~~,~~MAAM~~;~~YACnD~~,IAAI,CAAC,~~OAAO~~,CAAC,GAAG,CAAC,CAAC;~~QACnB~~,CAAC;QAED,~~OAAO~~,IAAI,CAAC~~;IACb~~,CAAC;~~IASO~~,~~KAAK~~,CAAC,~~iBAAiB~~,CAAC,~~IAAc~~;~~QAC7C~~,~~MAAM~~,~~SAAS~~,~~GAAG~~,~~IAAI~~,IAAI,CAAC,~~GAAG~~,IAAI,CAAC,CAAC,CAAC,~~gBAAgB~~,CAAC,CAAC~~;QACvD~~,MAAM,~~OAAO~~,~~GAAG~~,~~IAAI~~,~~IAAI~~,~~CACvB~~,IAAI,~~IAAI~~,CAAC,~~GAAG~~,~~IAAI~~,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,~~gBAAgB~~,CAAC,CAAC,~~OAAO~~,~~EAAE~~,~~GAAG~~,~~gBAAI~~,CAAC,IAAI,~~CAAC~~,~~cAAc~~,~~CAC7E~~,CAAC;~~QAIF~~,MAAM,~~KAAK~~,GAAG,MAAM,IAAI,CAAC,~~gBAAgB~~,CAAC,~~gBAAgB~~,EAAE,CAAC;~~QAE7D~~,MAAM,CAAC,~~KAAK~~,~~EAAE~~,~~EAAE~~,~~wBAAwB~~,EAAE,CAAC,~~GAAG~~,~~MAAM~~,~~OAAO~~,CAAC,~~GAAG~~,CAAC~~;YAG/D~~,IAAI,CAAC,~~eAAe~~,CAAC,~~iBAAiB~~,~~CAAC;gBACtC~~,IAAI,EAAE,~~KAAK;gBACX~~,~~SAAS~~;~~gBACT~~,~~OAAO~~;~~gBACP~~,~~QAAQ~~,~~EAAE~~,~~KAAK;aACf~~,CAAC;~~YAGF~~,~~IAAI~~,CAAC,~~wBAAwB~~,~~CAAC~~,wBAAwB,EAAE~~;SACxD~~,CAAC,~~CAAC;QAEH~~,MAAM,~~MAAM~~,~~GAAG~~,~~IAAI,~~GAAG,CAAC,~~KAAK~~,CAAC,~~GAAG~~,CAAC,CAAC,~~GAAG~~,EAAE,~~EAAE~~,~~CAAC~~,CAAC,GAAG,~~CAAC,~~IAAI,CAAC,~~KAAK~~,CAAC,CAAC,~~EAAE~~,EAAE,CAAC,EAAE,~~GAAG~~,CAAC,~~MAAM~~,CAAC,~~KAAK~~,~~IAAI~~,CAAC,CAAC,CAAC,CAAC,CAAC;~~QAE3F~~,OAAO;YACN,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,oBAAoB,EAAE,KAAK,EAAE,wBAAwB,EAAE;YAGnF,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACtB,IAAI,EAAE,OAAgB;gBACtB,IAAI,EAAE,oBAAoB;gBAC1B,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;gBAC5B,IAAI;aACJ,CAAC,CAAC;SACH,CAAC;IACH,CAAC;CACD,CAAA;;~~mCA/OY~~,wBAAwB;IADpC,IAAA,YAAO,GAAE;qCAKiB,mDAAuB,EACb,0EAAkC,EACnC,kCAAe,~~EACd~~,~~2BAAgB~~,~~EAChB~~,~~oCAAgB~~,EACR,6BAAwB,EACzC,iBAAO,EACR,uBAAM,EACA,4BAAY,EAC7B,8BAAY;GAbf,wBAAwB,~~CA+OpC~~;AAGD,SAAS,YAAY,CAAC,OAAa,EAAE,KAAa;IACjD,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,KAAK,GAAG,gBAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAClG,CAAC"}
1	+ {"version":3,"file":"instance-reporting.service.js","sourceRoot":"","sources":["../../../src/modules/instance-reporting.ee/instance-reporting.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/source-control.ee/constants.d.ts CHANGED Viewed

@@ -8,6 +8,9 @@ export declare const SOURCE_CONTROL_VARIABLES_EXPORT_FILE = "variable_stubs.json
 export declare const SOURCE_CONTROL_TAGS_EXPORT_FILE = "tags.json";
 export declare const SOURCE_CONTROL_FOLDERS_EXPORT_FILE = "folders.json";
 export declare const SOURCE_CONTROL_DATATABLES_EXPORT_FOLDER = "datatables";
+export declare const SOURCE_CONTROL_MANAGED_DIRECTORIES: readonly ["workflows", "credential_stubs", "projects", "datatables"];
+export declare const SOURCE_CONTROL_MANAGED_FILES: readonly ["tags.json", "folders.json", "variable_stubs.json"];
+export declare const SOURCE_CONTROL_MANAGED_PATHS: readonly ["workflows", "credential_stubs", "projects", "datatables", "tags.json", "folders.json", "variable_stubs.json"];
 export declare const SOURCE_CONTROL_OWNERS_EXPORT_FILE = "workflow_owners.json";
 export declare const SOURCE_CONTROL_SSH_FOLDER = "ssh";
 export declare const SOURCE_CONTROL_SSH_KEY_NAME = "key";

package/dist/modules/source-control.ee/constants.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SOURCE_CONTROL_READ_FILE_BATCH_SIZE = exports.SOURCE_CONTROL_WRITE_FILE_BATCH_SIZE = exports.SOURCE_CONTROL_DEFAULT_EMAIL = exports.SOURCE_CONTROL_DEFAULT_NAME = exports.SOURCE_CONTROL_README = exports.SOURCE_CONTROL_ORIGIN = exports.SOURCE_CONTROL_DEFAULT_BRANCH_COLOR = exports.SOURCE_CONTROL_DEFAULT_BRANCH = exports.SOURCE_CONTROL_SSH_KEY_NAME = exports.SOURCE_CONTROL_SSH_FOLDER = exports.SOURCE_CONTROL_OWNERS_EXPORT_FILE = exports.SOURCE_CONTROL_DATATABLES_EXPORT_FOLDER = exports.SOURCE_CONTROL_FOLDERS_EXPORT_FILE = exports.SOURCE_CONTROL_TAGS_EXPORT_FILE = exports.SOURCE_CONTROL_VARIABLES_EXPORT_FILE = exports.SOURCE_CONTROL_CREDENTIAL_EXPORT_FOLDER = exports.SOURCE_CONTROL_PROJECT_EXPORT_FOLDER = exports.SOURCE_CONTROL_WORKFLOW_EXPORT_FOLDER = exports.SOURCE_CONTROL_GIT_KEY_COMMENT = exports.SOURCE_CONTROL_GIT_FOLDER = exports.SOURCE_CONTROL_PREFERENCES_DB_KEY = void 0;
+exports.SOURCE_CONTROL_READ_FILE_BATCH_SIZE = exports.SOURCE_CONTROL_WRITE_FILE_BATCH_SIZE = exports.SOURCE_CONTROL_DEFAULT_EMAIL = exports.SOURCE_CONTROL_DEFAULT_NAME = exports.SOURCE_CONTROL_README = exports.SOURCE_CONTROL_ORIGIN = exports.SOURCE_CONTROL_DEFAULT_BRANCH_COLOR = exports.SOURCE_CONTROL_DEFAULT_BRANCH = exports.SOURCE_CONTROL_SSH_KEY_NAME = exports.SOURCE_CONTROL_SSH_FOLDER = exports.SOURCE_CONTROL_OWNERS_EXPORT_FILE = exports.SOURCE_CONTROL_MANAGED_PATHS = exports.SOURCE_CONTROL_MANAGED_FILES = exports.SOURCE_CONTROL_MANAGED_DIRECTORIES = exports.SOURCE_CONTROL_DATATABLES_EXPORT_FOLDER = exports.SOURCE_CONTROL_FOLDERS_EXPORT_FILE = exports.SOURCE_CONTROL_TAGS_EXPORT_FILE = exports.SOURCE_CONTROL_VARIABLES_EXPORT_FILE = exports.SOURCE_CONTROL_CREDENTIAL_EXPORT_FOLDER = exports.SOURCE_CONTROL_PROJECT_EXPORT_FOLDER = exports.SOURCE_CONTROL_WORKFLOW_EXPORT_FOLDER = exports.SOURCE_CONTROL_GIT_KEY_COMMENT = exports.SOURCE_CONTROL_GIT_FOLDER = exports.SOURCE_CONTROL_PREFERENCES_DB_KEY = void 0;
 exports.SOURCE_CONTROL_PREFERENCES_DB_KEY = 'features.sourceControl';
 exports.SOURCE_CONTROL_GIT_FOLDER = 'git';
 exports.SOURCE_CONTROL_GIT_KEY_COMMENT = 'n8n deploy key';
@@ -11,6 +11,21 @@ exports.SOURCE_CONTROL_VARIABLES_EXPORT_FILE = 'variable_stubs.json';
 exports.SOURCE_CONTROL_TAGS_EXPORT_FILE = 'tags.json';
 exports.SOURCE_CONTROL_FOLDERS_EXPORT_FILE = 'folders.json';
 exports.SOURCE_CONTROL_DATATABLES_EXPORT_FOLDER = 'datatables';
+exports.SOURCE_CONTROL_MANAGED_DIRECTORIES = [
+    exports.SOURCE_CONTROL_WORKFLOW_EXPORT_FOLDER,
+    exports.SOURCE_CONTROL_CREDENTIAL_EXPORT_FOLDER,
+    exports.SOURCE_CONTROL_PROJECT_EXPORT_FOLDER,
+    exports.SOURCE_CONTROL_DATATABLES_EXPORT_FOLDER,
+];
+exports.SOURCE_CONTROL_MANAGED_FILES = [
+    exports.SOURCE_CONTROL_TAGS_EXPORT_FILE,
+    exports.SOURCE_CONTROL_FOLDERS_EXPORT_FILE,
+    exports.SOURCE_CONTROL_VARIABLES_EXPORT_FILE,
+];
+exports.SOURCE_CONTROL_MANAGED_PATHS = [
+    ...exports.SOURCE_CONTROL_MANAGED_DIRECTORIES,
+    ...exports.SOURCE_CONTROL_MANAGED_FILES,
+];
 exports.SOURCE_CONTROL_OWNERS_EXPORT_FILE = 'workflow_owners.json';
 exports.SOURCE_CONTROL_SSH_FOLDER = 'ssh';
 exports.SOURCE_CONTROL_SSH_KEY_NAME = 'key';

package/dist/modules/source-control.ee/constants.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/modules/source-control.ee/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,iCAAiC,GAAG,wBAAwB,CAAC;AAC7D,QAAA,yBAAyB,GAAG,KAAK,CAAC;AAClC,QAAA,8BAA8B,GAAG,gBAAgB,CAAC;AAClD,QAAA,qCAAqC,GAAG,WAAW,CAAC;AACpD,QAAA,oCAAoC,GAAG,UAAU,CAAC;AAClD,QAAA,uCAAuC,GAAG,kBAAkB,CAAC;AAC7D,QAAA,oCAAoC,GAAG,qBAAqB,CAAC;AAC7D,QAAA,+BAA+B,GAAG,WAAW,CAAC;AAC9C,QAAA,kCAAkC,GAAG,cAAc,CAAC;AACpD,QAAA,uCAAuC,GAAG,YAAY,CAAC;~~AACvD~~,QAAA,iCAAiC,GAAG,sBAAsB,CAAC;AAC3D,QAAA,yBAAyB,GAAG,KAAK,CAAC;AAClC,QAAA,2BAA2B,GAAG,KAAK,CAAC;AACpC,QAAA,6BAA6B,GAAG,MAAM,CAAC;AACvC,QAAA,mCAAmC,GAAG,SAAS,CAAC;AAChD,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AACjC,QAAA,qBAAqB,GAAG;;CAEpC,CAAC;AACW,QAAA,2BAA2B,GAAG,UAAU,CAAC;AACzC,QAAA,4BAA4B,GAAG,iBAAiB,CAAC;AACjD,QAAA,oCAAoC,GAAG,EAAE,CAAC;AAC1C,QAAA,mCAAmC,GAAG,EAAE,CAAC"}
1	+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/modules/source-control.ee/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,iCAAiC,GAAG,wBAAwB,CAAC;AAC7D,QAAA,yBAAyB,GAAG,KAAK,CAAC;AAClC,QAAA,8BAA8B,GAAG,gBAAgB,CAAC;AAClD,QAAA,qCAAqC,GAAG,WAAW,CAAC;AACpD,QAAA,oCAAoC,GAAG,UAAU,CAAC;AAClD,QAAA,uCAAuC,GAAG,kBAAkB,CAAC;AAC7D,QAAA,oCAAoC,GAAG,qBAAqB,CAAC;AAC7D,QAAA,+BAA+B,GAAG,WAAW,CAAC;AAC9C,QAAA,kCAAkC,GAAG,cAAc,CAAC;AACpD,QAAA,uCAAuC,GAAG,YAAY,CAAC;AAEvD,QAAA,kCAAkC,GAAG;IACjD,QAAA,qCAAqC;IACrC,QAAA,uCAAuC;IACvC,QAAA,oCAAoC;IACpC,QAAA,uCAAuC;CAC9B,CAAC;AAEE,QAAA,4BAA4B,GAAG;IAC3C,QAAA,+BAA+B;IAC/B,QAAA,kCAAkC;IAClC,QAAA,oCAAoC;CAC3B,CAAC;AACE,QAAA,4BAA4B,GAAG;IAC3C,GAAG,QAAA,kCAAkC;IACrC,GAAG,QAAA,4BAA4B;CACtB,CAAC;AACE,QAAA,iCAAiC,GAAG,sBAAsB,CAAC;AAC3D,QAAA,yBAAyB,GAAG,KAAK,CAAC;AAClC,QAAA,2BAA2B,GAAG,KAAK,CAAC;AACpC,QAAA,6BAA6B,GAAG,MAAM,CAAC;AACvC,QAAA,mCAAmC,GAAG,SAAS,CAAC;AAChD,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AACjC,QAAA,qBAAqB,GAAG;;CAEpC,CAAC;AACW,QAAA,2BAA2B,GAAG,UAAU,CAAC;AACzC,QAAA,4BAA4B,GAAG,iBAAiB,CAAC;AACjD,QAAA,oCAAoC,GAAG,EAAE,CAAC;AAC1C,QAAA,mCAAmC,GAAG,EAAE,CAAC"}

package/dist/modules/source-control.ee/source-control-git.service.ee.d.ts CHANGED Viewed

@@ -43,6 +43,11 @@ export declare class SourceControlGitService {
     diffRemote(): Promise<DiffResult | undefined>;
     diffLocal(): Promise<DiffResult | undefined>;
     fetch(): Promise<FetchResult>;
+    private assertManagedTreeContainsOnlyRegularFiles;
+    private parseTreeEntries;
+    private regularFileRejectionReason;
+    private rejectUnsupportedEntry;
+    private fetchAndValidateRemoteCommit;
     pull(options?: {
         ffOnly: boolean;
     }): Promise<PullResult>;

package/dist/modules/source-control.ee/source-control-git.service.ee.js CHANGED Viewed

@@ -115,13 +115,17 @@ let SourceControlGitService = class SourceControlGitService {
         this.gitOptions = {
             baseDir: gitFolder,
             binary: 'git',
+            config: ['core.symlinks=false'],
             maxConcurrentProcesses: 6,
             trimmed: false,
         };
         const { simpleGit } = await import('simple-git');
         if (preferences.connectionType === 'https') {
             const credentials = await this.sourceControlPreferencesService.getDecryptedHttpsCredentials();
-            const config = (0, promotions_git_utils_1.buildHttpsGitConfig)({ repositoryUrl: preferences.repositoryUrl });
+            const config = [
+                ...(this.gitOptions.config ?? []),
+                ...(0, promotions_git_utils_1.buildHttpsGitConfig)({ repositoryUrl: preferences.repositoryUrl }),
+            ];
             const httpsGitOptions = {
                 ...this.gitOptions,
                 config,
@@ -239,10 +243,8 @@ let SourceControlGitService = class SourceControlGitService {
         }
         const { currentBranch, branches: remoteBranches } = await this.getBranches();
         if (!currentBranch && remoteBranches.some((b) => b === targetBranch)) {
-            await this.git.checkout(targetBranch);
-            const upstream = [constants_1.SOURCE_CONTROL_ORIGIN, targetBranch].join('/');
-            await this.git.branch([`--set-upstream-to=${upstream}`, targetBranch]);
-            this.logger.info('Set local git repository to track remote', { upstream });
+            await this.setBranch(targetBranch);
+            this.logger.info('Set local git repository to track remote', { targetBranch });
         }
     }
     async ensureBranchSetup(targetBranch) {
@@ -262,10 +264,8 @@ let SourceControlGitService = class SourceControlGitService {
         const { branches: remoteBranches } = await this.getBranches();
         if (remoteBranches.includes(targetBranch)) {
             try {
-                await this.git.checkout(targetBranch);
-                const upstream = [constants_1.SOURCE_CONTROL_ORIGIN, targetBranch].join('/');
-                await this.git.branch([`--set-upstream-to=${upstream}`, targetBranch]);
-                this.logger.info('Recovered source control branch setup', { targetBranch, upstream });
+                await this.setBranch(targetBranch);
+                this.logger.info('Recovered source control branch setup', { targetBranch });
             }
             catch (error) {
                 this.logger.warn('Failed to checkout branch during recovery', { targetBranch, error });
@@ -303,7 +303,8 @@ let SourceControlGitService = class SourceControlGitService {
         if (!this.git) {
             throw new n8n_workflow_1.UnexpectedError('Git is not initialized (setBranch)');
         }
-        await this.git.checkout(branch);
+        const { commit } = await this.fetchAndValidateRemoteCommit(branch);
+        await this.git.raw(['checkout', '-B', branch, commit]);
         await this.git.branch([`--set-upstream-to=${constants_1.SOURCE_CONTROL_ORIGIN}/${branch}`, branch]);
         return await this.getBranches();
     }
@@ -346,16 +347,105 @@ let SourceControlGitService = class SourceControlGitService {
         await this.setGitCommand();
         return await this.git.fetch();
     }
+    async assertManagedTreeContainsOnlyRegularFiles(ref) {
+        if (!this.git) {
+            throw new n8n_workflow_1.UnexpectedError('Git is not initialized (assertManagedTreeContainsOnlyRegularFiles)');
+        }
+        const directShapes = await this.git.raw([
+            'ls-tree',
+            '-z',
+            '--full-tree',
+            ref,
+            '--',
+            ...constants_1.SOURCE_CONTROL_MANAGED_PATHS,
+        ]);
+        const managedDirectories = constants_1.SOURCE_CONTROL_MANAGED_DIRECTORIES;
+        for (const entry of this.parseTreeEntries(directShapes)) {
+            let reason;
+            if (entry.malformed) {
+                reason = 'Git returned malformed tree metadata';
+            }
+            else if (managedDirectories.includes(entry.filePath)) {
+                if (entry.objectType !== 'tree') {
+                    reason = `Managed path ${entry.filePath} must be a directory`;
+                }
+            }
+            else {
+                reason = this.regularFileRejectionReason(entry);
+            }
+            if (reason)
+                this.rejectUnsupportedEntry(entry.filePath, reason);
+        }
+        const directoryContents = await this.git.raw([
+            'ls-tree',
+            '-r',
+            '-z',
+            '--full-tree',
+            ref,
+            '--',
+            ...constants_1.SOURCE_CONTROL_MANAGED_DIRECTORIES,
+        ]);
+        for (const entry of this.parseTreeEntries(directoryContents)) {
+            const reason = entry.malformed
+                ? 'Git returned malformed tree metadata'
+                : this.regularFileRejectionReason(entry);
+            if (reason)
+                this.rejectUnsupportedEntry(entry.filePath, reason);
+        }
+    }
+    parseTreeEntries(output) {
+        return output
+            .split('\0')
+            .filter((entry) => entry.length > 0)
+            .map((entry) => {
+            const separatorIndex = entry.indexOf('\t');
+            const metadata = separatorIndex === -1 ? entry : entry.slice(0, separatorIndex);
+            const filePath = separatorIndex === -1 ? '<unknown>' : entry.slice(separatorIndex + 1);
+            const [mode, objectType, objectId, ...unexpectedMetadata] = metadata.split(' ');
+            const malformed = separatorIndex === -1 ||
+                !mode ||
+                !objectType ||
+                !objectId ||
+                unexpectedMetadata.length > 0;
+            return { mode, objectType, objectId, filePath, malformed };
+        });
+    }
+    regularFileRejectionReason(entry) {
+        if (entry.objectType !== 'blob') {
+            return `Git object type ${entry.objectType} is not supported`;
+        }
+        if (entry.mode !== '100644' && entry.mode !== '100755') {
+            return `Git file mode ${entry.mode} is not supported`;
+        }
+        return undefined;
+    }
+    rejectUnsupportedEntry(filePath, reason) {
+        this.logger.error('Remote source control tree contains an unsupported managed entry', {
+            filePath,
+            reason,
+        });
+        throw new n8n_workflow_1.UserError('The remote repository contains an unsupported source control entry. Update the repository and try again.');
+    }
+    async fetchAndValidateRemoteCommit(branch) {
+        if (!this.git) {
+            throw new n8n_workflow_1.UnexpectedError('Git is not initialized (fetchAndValidateRemoteCommit)');
+        }
+        await this.fetch();
+        const resolvedBranch = branch ?? (await this.git.branch()).current;
+        if (!resolvedBranch) {
+            throw new n8n_workflow_1.UserError('The source control branch is not configured.');
+        }
+        const remoteRef = `refs/remotes/${constants_1.SOURCE_CONTROL_ORIGIN}/${resolvedBranch}`;
+        const commit = (await this.git.raw(['rev-parse', '--verify', `${remoteRef}^{commit}`])).trim();
+        await this.assertManagedTreeContainsOnlyRegularFiles(commit);
+        return { branch: resolvedBranch, commit };
+    }
     async pull(options = { ffOnly: true }) {
         if (!this.git) {
             throw new n8n_workflow_1.UnexpectedError('Git is not initialized (pull)');
         }
-        await this.setGitCommand();
-        const params = {};
-        if (options.ffOnly) {
-            Object.assign(params, { '--ff-only': true });
-        }
-        return await this.git.pull(params);
+        const { commit } = await this.fetchAndValidateRemoteCommit();
+        return await this.git.merge([...(options.ffOnly ? ['--ff-only'] : []), commit]);
     }
     async push(options = {
         force: false,
@@ -390,6 +480,12 @@ let SourceControlGitService = class SourceControlGitService {
             throw new n8n_workflow_1.UnexpectedError('Git is not initialized (Promise)');
         }
         if (options?.hard) {
+            const remotePrefix = `${constants_1.SOURCE_CONTROL_ORIGIN}/`;
+            if (options.target.startsWith(remotePrefix)) {
+                const branch = options.target.slice(remotePrefix.length);
+                const { commit } = await this.fetchAndValidateRemoteCommit(branch);
+                return await this.git.raw(['reset', '--hard', commit]);
+            }
             return await this.git.raw(['reset', '--hard', options.target]);
         }
         return await this.git.raw(['reset', options.target]);

package/dist/modules/source-control.ee/source-control-git.service.ee.js.map CHANGED Viewed

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

package/dist/modules/source-control.ee/source-control-import.service.ee.js CHANGED Viewed

@@ -104,6 +104,7 @@ let SourceControlImportService = class SourceControlImportService {
         const remoteWorkflowFiles = await (0, fast_glob_1.default)('*.json', {
             cwd: this.workflowExportFolder,
             absolute: true,
+            followSymbolicLinks: false,
         });
         const remoteWorkflowFilesParsed = await (0, source_control_helper_ee_1.mapInBatches)(remoteWorkflowFiles, constants_1.SOURCE_CONTROL_READ_FILE_BATCH_SIZE, async (file) => {
             const remote = await this.parseWorkflowFromFile(file);
@@ -230,6 +231,7 @@ let SourceControlImportService = class SourceControlImportService {
         const remoteCredentialFiles = await (0, fast_glob_1.default)('*.json', {
             cwd: this.credentialExportFolder,
             absolute: true,
+            followSymbolicLinks: false,
         });
         const remoteCredentialFilesRead = await (0, source_control_helper_ee_1.mapInBatches)(remoteCredentialFiles, constants_1.SOURCE_CONTROL_READ_FILE_BATCH_SIZE, async (file) => {
             this.logger.debug(`Parsing credential file ${file}`);
@@ -324,6 +326,7 @@ let SourceControlImportService = class SourceControlImportService {
         const variablesFile = await (0, fast_glob_1.default)(constants_1.SOURCE_CONTROL_VARIABLES_EXPORT_FILE, {
             cwd: this.gitFolder,
             absolute: true,
+            followSymbolicLinks: false,
         });
         if (variablesFile.length > 0) {
             this.logger.debug(`Importing variables from file ${variablesFile[0]}`);
@@ -340,6 +343,7 @@ let SourceControlImportService = class SourceControlImportService {
         const dataTableFiles = await (0, fast_glob_1.default)('*.json', {
             cwd: this.dataTableExportFolder,
             absolute: true,
+            followSymbolicLinks: false,
         });
         if (dataTableFiles.length === 0) {
             return [];
@@ -420,6 +424,7 @@ let SourceControlImportService = class SourceControlImportService {
         const foldersFile = await (0, fast_glob_1.default)(constants_1.SOURCE_CONTROL_FOLDERS_EXPORT_FILE, {
             cwd: this.gitFolder,
             absolute: true,
+            followSymbolicLinks: false,
         });
         if (foldersFile.length > 0) {
             this.logger.debug(`Importing folders from file ${foldersFile[0]}`);
@@ -461,6 +466,7 @@ let SourceControlImportService = class SourceControlImportService {
         const tagsFile = await (0, fast_glob_1.default)(constants_1.SOURCE_CONTROL_TAGS_EXPORT_FILE, {
             cwd: this.gitFolder,
             absolute: true,
+            followSymbolicLinks: false,
         });
         if (tagsFile.length > 0) {
             this.logger.debug(`Importing tags from file ${tagsFile[0]}`);
@@ -485,6 +491,7 @@ let SourceControlImportService = class SourceControlImportService {
         const remoteProjectFiles = await (0, fast_glob_1.default)('*.json', {
             cwd: this.projectExportFolder,
             absolute: true,
+            followSymbolicLinks: false,
         });
         const remoteProjects = await (0, source_control_helper_ee_1.mapInBatches)(remoteProjectFiles, constants_1.SOURCE_CONTROL_READ_FILE_BATCH_SIZE, async (file) => {
             this.logger.debug(`Parsing project file ${file}`);