@atom8n/n8n-core 2.4.5 → 2.5.1

package/dist/conflicting-storage-paths.error.d.ts

@@ -0,0 +1,4 @@
+import { UserError } from 'n8n-workflow';
+export declare class ConflictingStoragePathsError extends UserError {
+    constructor();
+}

package/dist/conflicting-storage-paths.error.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConflictingStoragePathsError = void 0;
+const n8n_workflow_1 = require("n8n-workflow");
+class ConflictingStoragePathsError extends n8n_workflow_1.UserError {
+    constructor() {
+        super([
+            'Both N8N_STORAGE_PATH and N8N_BINARY_DATA_STORAGE_PATH are set to different values.',
+            'N8N_BINARY_DATA_STORAGE_PATH is deprecated. Please use only N8N_STORAGE_PATH.',
+        ].join(' '));
+    }
+}
+exports.ConflictingStoragePathsError = ConflictingStoragePathsError;

package/dist/execution-engine/node-execution-context/utils/file-system-helper-functions.js

@@ -35,13 +35,14 @@ async function resolvePath(path) {
 }
 function isFilePatternBlocked(resolvedFilePath) {
     const { blockFilePatterns } = di_1.Container.get(config_1.SecurityConfig);
+    const normalizedPath = node_path_1.posix.normalize(resolvedFilePath.replace(/\\/g, '/'));
     return blockFilePatterns
         .split(';')
         .map((pattern) => pattern.trim())
         .filter((pattern) => pattern)
         .some((pattern) => {
         try {
-            return new RegExp(pattern, 'mi').test(resolvedFilePath);
+            return new RegExp(pattern, 'mi').test(normalizedPath);
         }
         catch {
             return true;

package/dist/execution-engine/node-execution-context/utils/resolve-source-overwrite.d.ts

@@ -0,0 +1,2 @@
+import type { IExecuteData, INodeExecutionData } from 'n8n-workflow';
+export declare function resolveSourceOverwrite(item: INodeExecutionData, executionData: IExecuteData): import("n8n-workflow").ISourceData | null | undefined;

package/dist/execution-engine/node-execution-context/utils/resolve-source-overwrite.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveSourceOverwrite = resolveSourceOverwrite;
+function resolveSourceOverwrite(item, executionData) {
+    const isToolExecution = !!executionData.metadata?.preserveSourceOverwrite;
+    if (!isToolExecution) {
+        return null;
+    }
+    if (executionData.metadata?.preservedSourceOverwrite) {
+        return executionData.metadata.preservedSourceOverwrite;
+    }
+    if (typeof item.pairedItem === 'object' && 'sourceOverwrite' in item.pairedItem) {
+        return item.pairedItem.sourceOverwrite;
+    }
+    return null;
+}

package/dist/storage.config.d.ts

@@ -0,0 +1,11 @@
+import { z } from 'zod';
+import { InstanceSettings } from './instance-settings';
+export declare const EXECUTION_DATA_STORAGE_MODES: readonly ["database", "filesystem"];
+declare const modeSchema: z.ZodEnum<["database", "filesystem"]>;
+export declare class StorageConfig {
+    mode: z.infer<typeof modeSchema>;
+    storagePath: string;
+    constructor({ n8nFolder }: InstanceSettings);
+    sanitize(): void;
+}
+export {};

package/dist/storage.config.js

@@ -0,0 +1,49 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StorageConfig = exports.EXECUTION_DATA_STORAGE_MODES = void 0;
+const config_1 = require("@n8n/config");
+const node_path_1 = __importDefault(require("node:path"));
+const zod_1 = require("zod");
+const conflicting_storage_paths_error_1 = require("./conflicting-storage-paths.error");
+const instance_settings_1 = require("./instance-settings");
+exports.EXECUTION_DATA_STORAGE_MODES = ['database', 'filesystem'];
+const modeSchema = zod_1.z.enum(exports.EXECUTION_DATA_STORAGE_MODES);
+let StorageConfig = class StorageConfig {
+    constructor({ n8nFolder }) {
+        this.mode = 'database';
+        this.storagePath = node_path_1.default.join(n8nFolder, 'storage');
+    }
+    sanitize() {
+        const storagePath = process.env.N8N_STORAGE_PATH;
+        const binaryDataStoragePath = process.env.N8N_BINARY_DATA_STORAGE_PATH;
+        if (storagePath === undefined || binaryDataStoragePath === undefined)
+            return;
+        if (storagePath !== binaryDataStoragePath)
+            throw new conflicting_storage_paths_error_1.ConflictingStoragePathsError();
+    }
+};
+exports.StorageConfig = StorageConfig;
+__decorate([
+    (0, config_1.Env)('N8N_EXECUTION_DATA_STORAGE_MODE', modeSchema),
+    __metadata("design:type", void 0)
+], StorageConfig.prototype, "mode", void 0);
+__decorate([
+    (0, config_1.Env)('N8N_STORAGE_PATH'),
+    __metadata("design:type", String)
+], StorageConfig.prototype, "storagePath", void 0);
+exports.StorageConfig = StorageConfig = __decorate([
+    config_1.Config,
+    __metadata("design:paramtypes", [instance_settings_1.InstanceSettings])
+], StorageConfig);

package/dist/utils/convert-binary-data.d.ts

@@ -0,0 +1,2 @@
+import type { IRunNodeResponse, WorkflowSettingsBinaryMode } from 'n8n-workflow';
+export declare function convertBinaryData(workflowId: string, executionId: string | undefined, responseData: IRunNodeResponse, binaryMode: WorkflowSettingsBinaryMode | undefined): Promise<IRunNodeResponse>;

package/dist/utils/convert-binary-data.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertBinaryData = convertBinaryData;
+const di_1 = require("@n8n/di");
+const n8n_workflow_1 = require("n8n-workflow");
+const binary_data_config_1 = require("../binary-data/binary-data.config");
+const binary_helper_functions_1 = require("../execution-engine/node-execution-context/utils/binary-helper-functions");
+async function convertBinaryData(workflowId, executionId, responseData, binaryMode) {
+    const { mode } = di_1.Container.get(binary_data_config_1.BinaryDataConfig);
+    if (binaryMode !== n8n_workflow_1.BINARY_MODE_COMBINED || mode === 'default')
+        return responseData;
+    if (!responseData.data?.length)
+        return responseData;
+    for (const outputData of responseData.data) {
+        for (const item of outputData) {
+            if (!item.binary)
+                continue;
+            item.json = { ...item.json };
+            item.binary = { ...item.binary };
+            const embeddedBinaries = {};
+            const jsonBinaries = {};
+            for (const [key, value] of Object.entries(item.binary)) {
+                if (value?.id) {
+                    jsonBinaries[key] = value;
+                    continue;
+                }
+                if (!executionId) {
+                    embeddedBinaries[key] = value;
+                    continue;
+                }
+                const buffer = Buffer.from(value.data, n8n_workflow_1.BINARY_ENCODING);
+                const binaryData = await (0, binary_helper_functions_1.prepareBinaryData)(buffer, executionId, workflowId, undefined, value?.mimeType);
+                if (value.fileName) {
+                    binaryData.fileName = value.fileName;
+                }
+                jsonBinaries[key] = binaryData;
+            }
+            const existingValue = item.json[n8n_workflow_1.BINARY_IN_JSON_PROPERTY] ?? {};
+            if (Array.isArray(existingValue) || typeof existingValue !== 'object') {
+                throw new n8n_workflow_1.UnexpectedError(`Binary data could not be converted. Item already has '${n8n_workflow_1.BINARY_IN_JSON_PROPERTY}' field, but value type is not an object`);
+            }
+            if (Object.keys(jsonBinaries).length) {
+                const existingJsonBinaries = existingValue;
+                item.json[n8n_workflow_1.BINARY_IN_JSON_PROPERTY] = { ...existingJsonBinaries, ...jsonBinaries };
+            }
+            item.binary = Object.keys(embeddedBinaries).length ? embeddedBinaries : undefined;
+        }
+    }
+    return responseData;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atom8n/n8n-core",
-  "version": "2.4.5",
+  "version": "2.5.1",
   "description": "Core functionality of n8n",
   "main": "dist/index",
   "types": "dist/index.d.ts",
@@ -28,8 +28,8 @@
     "bin"
   ],
   "devDependencies": {
-    "@n8n/errors": "npm:@atom8n/errors@0.7.3",
-    "@n8n/typescript-config": "npm:@atom8n/typescript-config@1.5.3",
+    "@n8n/errors": "npm:@atom8n/errors@0.8.1",
+    "@n8n/typescript-config": "npm:@atom8n/typescript-config@1.6.1",
     "@types/express": "^5.0.1",
     "@types/jsonwebtoken": "9.0.10",
     "@types/lodash": "4.17.17",
@@ -41,12 +41,12 @@
   "dependencies": {
     "@aws-sdk/client-s3": "3.808.0",
     "@langchain/core": "1.1.0",
-    "@n8n/backend-common": "npm:@atom8n/backend-common@1.4.4",
-    "@n8n/client-oauth2": "npm:@atom8n/client-oauth2@1.2.3",
-    "@n8n/config": "npm:@atom8n/config@2.3.3",
-    "@n8n/constants": "npm:@atom8n/constants@0.17.3",
-    "@n8n/decorators": "npm:@atom8n/decorators@1.4.3",
-    "@n8n/di": "npm:@atom8n/di@0.12.3",
+    "@n8n/backend-common": "npm:@atom8n/backend-common@1.5.1",
+    "@n8n/client-oauth2": "npm:@atom8n/client-oauth2@1.3.1",
+    "@n8n/config": "npm:@atom8n/config@2.4.1",
+    "@n8n/constants": "npm:@atom8n/constants@0.18.1",
+    "@n8n/decorators": "npm:@atom8n/decorators@1.5.1",
+    "@n8n/di": "npm:@atom8n/di@0.13.1",
     "@sentry/node": "^9.42.1",
     "@sentry/node-native": "^9.42.1",
     "axios": "1.12.0",
@@ -64,7 +64,7 @@
     "lodash": "4.17.21",
     "luxon": "3.4.4",
     "mime-types": "3.0.1",
-    "n8n-workflow": "npm:@atom8n/n8n-workflow@2.4.3",
+    "n8n-workflow": "npm:@atom8n/n8n-workflow@2.5.1",
     "nanoid": "3.3.8",
     "oauth-1.0a": "2.2.6",
     "p-cancelable": "2.1.1",