n8n-core 2.32.2 → 2.34.0

package/dist/binary-data/binary-data.service.d.ts

@@ -21,7 +21,7 @@ export declare class BinaryDataService {
     getAsStream(binaryDataId: string, chunkSize?: number): Promise<Readable>;
     getAsBuffer(binaryData: IBinaryData): Promise<Buffer<ArrayBufferLike>>;
     getPath(binaryDataId: string): string;
-    getMetadata(binaryDataId: string): Promise<BinaryData.Metadata>;
+    getMetadata(binaryDataId: string): Promise<import("@n8n/blob-storage").BlobMetadata>;
     deleteMany(locations: BinaryData.FileLocation[]): Promise<void>;
     deleteManyByBinaryDataId(ids: string[]): Promise<void>;
     duplicateBinaryData(location: BinaryData.FileLocation, inputData: Array<INodeExecutionData[] | null>): Promise<INodeExecutionData[][]>;

package/dist/binary-data/binary-data.service.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BinaryDataService = void 0;
 const backend_common_1 = require("@n8n/backend-common");
 const backend_network_1 = require("@n8n/backend-network");
+const blob_storage_1 = require("@n8n/blob-storage");
 const di_1 = require("@n8n/di");
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const n8n_workflow_1 = require("n8n-workflow");
@@ -22,6 +23,7 @@ const promises_1 = require("node:fs/promises");
 const pretty_bytes_1 = __importDefault(require("pretty-bytes"));
 const errors_1 = require("../errors");
 const binary_data_config_1 = require("./binary-data.config");
+const blob_manager_1 = require("./blob.manager");
 const invalid_manager_error_1 = require("../errors/invalid-manager.error");
 let BinaryDataService = class BinaryDataService {
     constructor(config, errorReporter, logger) {
@@ -37,8 +39,11 @@ let BinaryDataService = class BinaryDataService {
     async init() {
         const { config } = this;
         this.mode = config.mode === 'filesystem' ? 'filesystem-v2' : config.mode;
-        const { FileSystemManager } = await import('./file-system.manager.js');
-        this.managers.filesystem = new FileSystemManager(config.localStoragePath, this.errorReporter);
+        const fsByteStore = new blob_storage_1.FsByteStore({
+            storagePath: config.localStoragePath,
+            reportError: (error) => this.errorReporter.error(error),
+        });
+        this.managers.filesystem = new blob_manager_1.BinaryDataBlobManager(fsByteStore, this.errorReporter);
         this.managers['filesystem-v2'] = this.managers.filesystem;
         await this.managers.filesystem.init();
     }

package/dist/binary-data/binary-data.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"binary-data.service.js","sourceRoot":"","sources":["../../src/binary-data/binary-data.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"binary-data.service.js","sourceRoot":"","sources":["../../src/binary-data/binary-data.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA6C;AAC7C,0DAAsD;AACtD,oDAAgD;AAChD,gCAAkC;AAClC,gEAA+B;AAE/B,+CAAgE;AAEhE,+CAAkD;AAClD,gEAAuC;AAGvC,qCAAyC;AAEzC,6DAAwD;AACxD,iDAAuD;AAEvD,2EAAsE;AAG/D,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAK7B,YACkB,MAAwB,EACxB,aAA4B,EAC5B,MAAc;QAFd,WAAM,GAAN,MAAM,CAAkB;QACxB,kBAAa,GAAb,aAAa,CAAe;QAC5B,WAAM,GAAN,MAAM,CAAQ;QAPxB,SAAI,GAA2B,eAAe,CAAC;QAE/C,aAAQ,GAAuC,EAAE,CAAC;IAMvD,CAAC;IAEJ,UAAU,CAAC,IAA4B,EAAE,OAA2B;QACnE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,IAAI;QACT,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAExB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;QAEzE,MAAM,WAAW,GAAG,IAAI,0BAAW,CAAC;YACnC,WAAW,EAAE,MAAM,CAAC,gBAAgB;YACpC,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC;SACvD,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,UAAU,GAAG,IAAI,oCAAqB,CAAC,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QACtF,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;QAC1D,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;IAGvC,CAAC;IAED,iBAAiB,CAAC,UAAuB,EAAE,SAAS,GAAkB,OAAO;QAC5E,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;YACpB,MAAM,IAAI,8BAAe,CAAC,6CAA6C,CAAC,CAAC;QAC1E,CAAC;QAED,MAAM,cAAc,GAA8B;YACjD,EAAE,EAAE,UAAU,CAAC,EAAE;SACjB,CAAC;QAEF,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QACtC,OAAO,sBAAG,CAAC,IAAI,CAAC,cAAc,EAAE,aAAa,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,mBAAmB,CAAC,KAAa;QAChC,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QACtC,MAAM,aAAa,GAAG,sBAAG,CAAC,MAAM,CAAC,KAAK,EAAE,aAAa,CAA8B,CAAC;QACpF,OAAO,aAAa,CAAC,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,cAAc,CACnB,QAAiC,EACjC,UAAuB,EACvB,QAAgB;QAEhB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEzC,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAA,eAAI,EAAC,QAAQ,CAAC,CAAC;YACtC,UAAU,CAAC,QAAQ,GAAG,IAAA,sBAAW,EAAC,IAAI,CAAC,CAAC;YACxC,UAAU,CAAC,KAAK,GAAG,IAAI,CAAC;YACxB,UAAU,CAAC,IAAI,GAAG,MAAM,IAAA,mBAAQ,EAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,8BAAe,EAAE,CAAC,CAAC;YAE1E,OAAO,UAAU,CAAC;QACnB,CAAC;QAED,MAAM,QAAQ,GAAG;YAChB,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,QAAQ,EAAE,UAAU,CAAC,QAAQ;SAC7B,CAAC;QAEF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAExF,UAAU,CAAC,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAChD,UAAU,CAAC,QAAQ,GAAG,IAAA,sBAAW,EAAC,QAAQ,CAAC,CAAC;QAC5C,UAAU,CAAC,KAAK,GAAG,QAAQ,CAAC;QAC5B,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QAE5B,OAAO,UAAU,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,KAAK,CACV,QAAiC,EACjC,cAAiC,EACjC,UAAuB;QAEvB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEzC,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,MAAM,MAAM,GAAG,MAAM,IAAA,gCAAc,EAAC,cAAc,CAAC,CAAC;YACpD,UAAU,CAAC,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,8BAAe,CAAC,CAAC;YACnD,UAAU,CAAC,QAAQ,GAAG,IAAA,sBAAW,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACjD,UAAU,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC;YAEjC,OAAO,UAAU,CAAC;QACnB,CAAC;QAED,MAAM,QAAQ,GAAG;YAChB,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,QAAQ,EAAE,UAAU,CAAC,QAAQ;SAC7B,CAAC;QAEF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC;QAErF,UAAU,CAAC,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAChD,UAAU,CAAC,QAAQ,GAAG,IAAA,sBAAW,EAAC,QAAQ,CAAC,CAAC;QAC5C,UAAU,CAAC,KAAK,GAAG,QAAQ,CAAC;QAC5B,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QAE5B,OAAO,UAAU,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,YAAoB,EAAE,SAAkB;QACzD,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE/C,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,UAAuB;QACxC,IAAI,UAAU,CAAC,EAAE,EAAE,CAAC;YACnB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAEhD,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACxD,CAAC;QAED,OAAO,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,8BAAe,CAAC,CAAC;IACtD,CAAC;IAED,OAAO,CAAC,YAAoB;QAC3B,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE/C,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,YAAoB;QACrC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE/C,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,SAAoC;QACpD,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEzC,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,IAAI,OAAO,CAAC,UAAU;YAAE,MAAM,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,GAAa;QAC3C,MAAM,aAAa,GAAG,IAAI,GAAG,EAAoB,CAAC;QAElD,KAAK,MAAM,YAAY,IAAI,GAAG,EAAE,CAAC;YAChC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAE/C,IAAI,CAAC,MAAM,EAAE,CAAC;gBACb,SAAS;YACV,CAAC;YAED,MAAM,KAAK,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YAE5C,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACjD,CAAC;QAED,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,aAAa,EAAE,CAAC;YAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAEpC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACd,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,wBAAwB,IAAI,2CAA2C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC3F,CAAC;gBACF,SAAS;YACV,CAAC;YAED,MAAM,OAAO,CAAC,kBAAkB,EAAE,CAAC,OAAO,CAAC,CAAC;QAC7C,CAAC;IACF,CAAC;IAED,KAAK,CAAC,mBAAmB,CACxB,QAAiC,EACjC,SAA6C;QAE7C,IAAI,SAAS,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3C,MAAM,eAAe,GAAI,SAAoC,CAAC,GAAG,CAChE,KAAK,EAAE,kBAAkB,EAAE,EAAE;gBAC5B,IAAI,kBAAkB,EAAE,CAAC;oBACxB,OAAO,MAAM,OAAO,CAAC,GAAG,CACvB,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE;wBAC9C,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;4BAC1B,OAAO,MAAM,IAAI,CAAC,6BAA6B,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;wBAC1E,CAAC;wBAED,OAAO,aAAa,CAAC;oBACtB,CAAC,CAAC,CACF,CAAC;gBACH,CAAC;gBAED,OAAO,kBAAkB,CAAC;YAC3B,CAAC,CACD,CAAC;YAEF,OAAO,MAAM,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAC3C,CAAC;QAED,OAAO,SAAmC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,SAAiB,EAAE,SAAiB;QAChD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE3C,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAC5C,CAAC;IAMO,kBAAkB,CAAC,MAAc;QACxC,OAAO,GAAG,IAAI,CAAC,IAAI,IAAI,MAAM,EAAE,CAAC;IACjC,CAAC;IAEO,KAAK,CAAC,6BAA6B,CAC1C,QAAiC,EACjC,aAAiC;QAEjC,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEzC,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;YAC1B,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YACzD,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,GAAW,EAAE,EAAE;gBAC3D,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;oBAC3B,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;gBAClC,CAAC;gBAED,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;gBAClD,IAAI,CAAC,YAAY,EAAE,CAAC;oBACnB,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;gBAClC,CAAC;gBAED,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAEhD,OAAO,MAAM,OAAO,EAAE,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;oBACzE,KAAK,EAAE,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC;oBACzC,GAAG;iBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,OAAO,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC/C,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;oBAC7B,IAAI,GAAG,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;wBACxB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;oBACtC,CAAC;oBAED,OAAO,GAAG,CAAC;gBACZ,CAAC,EAAE,aAAa,CAAC,CAAC;YACnB,CAAC,CAAC,CAAC;QACJ,CAAC;QAED,OAAO,aAAa,CAAC;IACtB,CAAC;IAEO,UAAU,CAAC,IAAY;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEpC,IAAI,OAAO;YAAE,OAAO,OAAO,CAAC;QAE5B,MAAM,IAAI,2CAAmB,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;CACD,CAAA;;4BA7QY,iBAAiB;IAD7B,IAAA,YAAO,GAAE;qCAOiB,qCAAgB,EACT,sBAAa,EACpB,uBAAM;GARpB,iBAAiB,CA6Q7B"}

package/dist/binary-data/{azure-blob.manager.d.ts → blob.manager.d.ts}

@@ -1,9 +1,11 @@
+import type { ByteStore } from '@n8n/blob-storage';
 import type { Readable } from 'node:stream';
-import { AzureBlobService } from './azure-blob/azure-blob.service.ee';
+import type { ErrorReporter } from '../errors';
 import type { BinaryData } from './types';
-export declare class AzureBlobManager implements BinaryData.Manager {
-    private readonly azureBlobService;
-    constructor(azureBlobService: AzureBlobService);
+export declare class BinaryDataBlobManager implements BinaryData.Manager {
+    private readonly byteStore;
+    private readonly errorReporter;
+    constructor(byteStore: ByteStore, errorReporter: ErrorReporter);
     init(): Promise<void>;
     store(location: BinaryData.FileLocation, bufferOrStream: Buffer | Readable, metadata: BinaryData.PreWriteMetadata): Promise<{
         fileId: string;
@@ -13,6 +15,8 @@ export declare class AzureBlobManager implements BinaryData.Manager {
     getAsBuffer(fileId: string): Promise<Buffer<ArrayBufferLike>>;
     getAsStream(fileId: string, chunkSize?: number): Promise<Readable>;
     getMetadata(fileId: string): Promise<BinaryData.Metadata>;
+    deleteMany(locations: BinaryData.FileLocation[]): Promise<void>;
+    deleteManyByFileId(ids: string[]): Promise<void>;
     copyByFileId(targetLocation: BinaryData.FileLocation, sourceFileId: string): Promise<string>;
     copyByFilePath(targetLocation: BinaryData.FileLocation, sourcePath: string, metadata: BinaryData.PreWriteMetadata): Promise<{
         fileId: string;
@@ -20,4 +24,10 @@ export declare class AzureBlobManager implements BinaryData.Manager {
     }>;
     rename(oldFileId: string, newFileId: string): Promise<void>;
     private toFileId;
+    private toRelativePath;
+    private parseFileId;
+    private assertPathSegments;
+    private deleteBinaryDataDirs;
+    private metadataKey;
+    private storeMetadata;
 }

package/dist/binary-data/blob.manager.js

@@ -0,0 +1,148 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BinaryDataBlobManager = void 0;
+const n8n_workflow_1 = require("n8n-workflow");
+const node_fs_1 = require("node:fs");
+const uuid_1 = require("uuid");
+const utils_1 = require("./utils");
+const file_not_found_error_1 = require("../errors/file-not-found.error");
+const EXECUTION_PATH_MATCHER = /^workflows\/([^/]+)\/executions\/([^/]+)\/binary_data\//;
+class BinaryDataBlobManager {
+    constructor(byteStore, errorReporter) {
+        this.byteStore = byteStore;
+        this.errorReporter = errorReporter;
+    }
+    async init() {
+        await this.byteStore.init?.();
+    }
+    async store(location, bufferOrStream, metadata) {
+        const fileId = this.toFileId(location);
+        const fileSize = await this.byteStore.write(fileId, bufferOrStream, metadata);
+        await this.storeMetadata(fileId, { ...metadata, fileSize });
+        return { fileId, fileSize };
+    }
+    getPath(fileId) {
+        return this.byteStore.getAbsolutePath?.(fileId) ?? fileId;
+    }
+    async getAsBuffer(fileId) {
+        const buffer = await this.byteStore.read(fileId);
+        if (!buffer)
+            throw new file_not_found_error_1.FileNotFoundError(fileId);
+        return buffer;
+    }
+    async getAsStream(fileId, chunkSize) {
+        const stream = await this.byteStore.readStream(fileId, { chunkSize });
+        if (!stream)
+            throw new file_not_found_error_1.FileNotFoundError(fileId);
+        return stream;
+    }
+    async getMetadata(fileId) {
+        if (this.byteStore.getMetadata) {
+            const metadata = await this.byteStore.getMetadata(fileId);
+            if (!metadata)
+                throw new file_not_found_error_1.FileNotFoundError(fileId);
+            return metadata;
+        }
+        const metadataFile = await this.byteStore.read(this.metadataKey(fileId));
+        if (!metadataFile)
+            throw new file_not_found_error_1.FileNotFoundError(fileId);
+        return (0, n8n_workflow_1.jsonParse)(metadataFile.toString('utf-8'));
+    }
+    async deleteMany(locations) {
+        if (locations.length === 0)
+            return;
+        await this.deleteBinaryDataDirs(locations);
+    }
+    async deleteManyByFileId(ids) {
+        const keys = ids.flatMap((fileId) => {
+            try {
+                this.parseFileId(fileId);
+            }
+            catch {
+                this.errorReporter.warn('Could not parse file ID. Skip deletion', {
+                    extra: { fileId },
+                });
+                return [];
+            }
+            return this.byteStore.getMetadata ? [fileId] : [fileId, this.metadataKey(fileId)];
+        });
+        if (keys.length > 0) {
+            await this.byteStore.delete(keys);
+        }
+    }
+    async copyByFileId(targetLocation, sourceFileId) {
+        const targetFileId = this.toFileId(targetLocation);
+        if (this.byteStore.getMetadata) {
+            await this.byteStore.copy(sourceFileId, targetFileId);
+            return targetFileId;
+        }
+        const metadata = await this.getMetadata(sourceFileId);
+        await this.byteStore.copy(sourceFileId, targetFileId);
+        await this.storeMetadata(targetFileId, metadata);
+        return targetFileId;
+    }
+    async copyByFilePath(targetLocation, sourcePath, metadata) {
+        const fileId = this.toFileId(targetLocation);
+        const fileSize = await this.byteStore.write(fileId, (0, node_fs_1.createReadStream)(sourcePath), metadata);
+        await this.storeMetadata(fileId, { ...metadata, fileSize });
+        return { fileId, fileSize };
+    }
+    async rename(oldFileId, newFileId) {
+        await this.byteStore.rename(oldFileId, newFileId);
+        if (!this.byteStore.getMetadata) {
+            await this.byteStore.rename(this.metadataKey(oldFileId), this.metadataKey(newFileId));
+        }
+    }
+    toFileId(location) {
+        return `${this.toRelativePath(location)}/binary_data/${(0, uuid_1.v4)()}`;
+    }
+    toRelativePath(location) {
+        switch (location.type) {
+            case 'execution': {
+                const executionId = location.executionId || 'temp';
+                return `workflows/${location.workflowId}/executions/${executionId}`;
+            }
+            case 'custom': {
+                this.assertPathSegments(location.pathSegments);
+                return location.pathSegments.join('/');
+            }
+        }
+    }
+    parseFileId(fileId) {
+        const executionMatch = fileId.match(EXECUTION_PATH_MATCHER);
+        if (executionMatch) {
+            return utils_1.FileLocation.ofExecution(executionMatch[1], executionMatch[2]);
+        }
+        const binaryDataIndex = fileId.lastIndexOf('/binary_data/');
+        if (binaryDataIndex !== -1) {
+            const pathSegments = fileId.substring(0, binaryDataIndex).split('/');
+            this.assertPathSegments(pathSegments);
+            return utils_1.FileLocation.ofCustom({ pathSegments });
+        }
+        throw new n8n_workflow_1.UnexpectedError(`File ID ${fileId} has invalid format.`);
+    }
+    assertPathSegments(pathSegments) {
+        if (pathSegments.length === 0 || pathSegments.some((segment) => segment.length === 0)) {
+            throw new n8n_workflow_1.UnexpectedError('Custom file location requires non-empty path segments');
+        }
+    }
+    async deleteBinaryDataDirs(locations) {
+        const deletePrefix = this.byteStore.deletePrefix?.bind(this.byteStore);
+        if (!deletePrefix || locations.length === 0)
+            return;
+        const prefixes = [
+            ...new Set(locations.map((location) => `${this.toRelativePath(location)}/binary_data`)),
+        ];
+        await Promise.all(prefixes.map(async (prefix) => await deletePrefix(prefix)));
+    }
+    metadataKey(fileId) {
+        return `${fileId}.metadata`;
+    }
+    async storeMetadata(fileId, metadata) {
+        if (this.byteStore.getMetadata)
+            return;
+        await this.byteStore.write(this.metadataKey(fileId), Buffer.from(JSON.stringify(metadata), 'utf-8'));
+    }
+}
+exports.BinaryDataBlobManager = BinaryDataBlobManager;
+//# sourceMappingURL=blob.manager.js.map

package/dist/binary-data/blob.manager.js.map

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

package/dist/binary-data/index.d.ts

@@ -1,6 +1,5 @@
 export * from './binary-data.service';
+export { BinaryDataBlobManager } from './blob.manager';
 export { BinaryDataConfig } from './binary-data.config';
 export type * from './types';
-export type { AzureBlobService } from './azure-blob/azure-blob.service.ee';
-export type { ObjectStoreService } from './object-store/object-store.service.ee';
 export { isStoredMode as isValidNonDefaultMode, FileLocation } from './utils';

package/dist/binary-data/index.js

@@ -14,8 +14,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileLocation = exports.isValidNonDefaultMode = exports.BinaryDataConfig = void 0;
+exports.FileLocation = exports.isValidNonDefaultMode = exports.BinaryDataConfig = exports.BinaryDataBlobManager = void 0;
 __exportStar(require("./binary-data.service"), exports);
+var blob_manager_1 = require("./blob.manager");
+Object.defineProperty(exports, "BinaryDataBlobManager", { enumerable: true, get: function () { return blob_manager_1.BinaryDataBlobManager; } });
 var binary_data_config_1 = require("./binary-data.config");
 Object.defineProperty(exports, "BinaryDataConfig", { enumerable: true, get: function () { return binary_data_config_1.BinaryDataConfig; } });
 var utils_1 = require("./utils");

package/dist/binary-data/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/binary-data/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,wDAAsC;AACtC,2DAAwD;AAA/C,sHAAA,gBAAgB,OAAA;AAKzB,iCAA8E;AAArE,8GAAA,YAAY,OAAyB;AAAE,qGAAA,YAAY,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/binary-data/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,wDAAsC;AACtC,+CAAuD;AAA9C,qHAAA,qBAAqB,OAAA;AAC9B,2DAAwD;AAA/C,sHAAA,gBAAgB,OAAA;AAEzB,iCAA8E;AAArE,8GAAA,YAAY,OAAyB;AAAE,qGAAA,YAAY,OAAA"}

package/dist/binary-data/types.d.ts

@@ -1,3 +1,4 @@
+import type { BlobMetadata, PreWriteBlobMetadata } from '@n8n/blob-storage';
 import type { Readable } from 'stream';
 import type { BINARY_DATA_MODES } from './binary-data.config';
 export declare namespace BinaryData {
@@ -6,16 +7,12 @@ export declare namespace BinaryData {
     export type ConfigMode = (typeof BINARY_DATA_MODES)[number];
     export type ServiceMode = Exclude<ConfigMode, LegacyMode> | UpgradedMode;
     export type StoredMode = Exclude<ConfigMode | UpgradedMode, 'default'>;
-    export type Metadata = {
-        fileName?: string;
-        mimeType?: string;
-        fileSize: number;
-    };
+    export type Metadata = BlobMetadata;
     export type WriteResult = {
         fileId: string;
         fileSize: number;
     };
-    export type PreWriteMetadata = Omit<Metadata, 'fileSize'>;
+    export type PreWriteMetadata = PreWriteBlobMetadata;
     export type FileLocation = {
         type: 'execution';
         workflowId: string;

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

@@ -1,8 +1,6 @@
-import { Transform } from 'node:stream';
 import type { BinaryData } from './types';
 export { assertDir, exists } from '@n8n/backend-common';
 export declare function isStoredMode(mode: string): mode is BinaryData.StoredMode;
-export declare function createFixedSizeChunker(chunkSize: number): Transform;
 export declare const FileLocation: {
     ofExecution: (workflowId: string, executionId: string) => BinaryData.FileLocation;
     ofCustom: ({ pathSegments, sourceType, sourceId, }: {

package/dist/binary-data/utils.js

@@ -2,9 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileLocation = exports.exists = exports.assertDir = void 0;
 exports.isStoredMode = isStoredMode;
-exports.createFixedSizeChunker = createFixedSizeChunker;
-const n8n_workflow_1 = require("n8n-workflow");
-const node_stream_1 = require("node:stream");
 var backend_common_1 = require("@n8n/backend-common");
 Object.defineProperty(exports, "assertDir", { enumerable: true, get: function () { return backend_common_1.assertDir; } });
 Object.defineProperty(exports, "exists", { enumerable: true, get: function () { return backend_common_1.exists; } });
@@ -12,54 +9,6 @@ const STORED_MODES = ['filesystem', 'filesystem-v2', 's3', 'azure', 'database'];
 function isStoredMode(mode) {
     return STORED_MODES.includes(mode);
 }
-function createFixedSizeChunker(chunkSize) {
-    if (chunkSize <= 0) {
-        throw new n8n_workflow_1.UnexpectedError(`createFixedSizeChunker requires chunkSize > 0, got ${chunkSize}`);
-    }
-    const queue = [];
-    let queued = 0;
-    const take = (size) => {
-        const out = Buffer.allocUnsafe(size);
-        let written = 0;
-        while (written < size) {
-            const head = queue[0];
-            const need = size - written;
-            if (head.length <= need) {
-                head.copy(out, written);
-                written += head.length;
-                queue.shift();
-            }
-            else {
-                head.copy(out, written, 0, need);
-                queue[0] = head.subarray(need);
-                written += need;
-            }
-        }
-        queued -= size;
-        return out;
-    };
-    return new node_stream_1.Transform({
-        transform(chunk, _encoding, done) {
-            queue.push(chunk);
-            queued += chunk.length;
-            while (queued >= chunkSize) {
-                this.push(take(chunkSize));
-            }
-            done();
-        },
-        flush(done) {
-            if (queued > 0) {
-                this.push(take(queued));
-            }
-            done();
-        },
-        destroy(error, done) {
-            queue.length = 0;
-            queued = 0;
-            done(error);
-        },
-    });
-}
 exports.FileLocation = {
     ofExecution: (workflowId, executionId) => ({
         type: 'execution',

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

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/binary-data/utils.ts"],"names":[],"mappings":";;;;;AAAA,+CAA+C;AAC/C,6CAAwC;AAIxC,sDAAwD;AAA/C,2GAAA,SAAS,OAAA;AAAE,wGAAA,MAAM,OAAA;AAE1B,MAAM,YAAY,GAAG,CAAC,YAAY,EAAE,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,CAAU,CAAC;AAEzF,sBAA6B,IAAY;IACxC,OAAO,YAAY,CAAC,QAAQ,CAAC,IAA6B,CAAC,CAAC;AAC7D,CAAC;AAcD,gCAAuC,SAAiB;IACvD,IAAI,SAAS,IAAI,CAAC,EAAE,CAAC;QACpB,MAAM,IAAI,8BAAe,CAAC,sDAAsD,SAAS,EAAE,CAAC,CAAC;IAC9F,CAAC;IAED,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,MAAM,GAAG,CAAC,CAAC;IAEf,MAAM,IAAI,GAAG,CAAC,IAAY,EAAU,EAAE;QACrC,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,OAAO,OAAO,GAAG,IAAI,EAAE,CAAC;YACvB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACtB,MAAM,IAAI,GAAG,IAAI,GAAG,OAAO,CAAC;YAC5B,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;gBACzB,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;gBACxB,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC;gBACvB,KAAK,CAAC,KAAK,EAAE,CAAC;YACf,CAAC;iBAAM,CAAC;gBACP,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;gBACjC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAC/B,OAAO,IAAI,IAAI,CAAC;YACjB,CAAC;QACF,CAAC;QACD,MAAM,IAAI,IAAI,CAAC;QACf,OAAO,GAAG,CAAC;IACZ,CAAC,CAAC;IAEF,OAAO,IAAI,uBAAS,CAAC;QACpB,SAAS,CAAC,KAAa,EAAE,SAAS,EAAE,IAAI;YACvC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC;YACvB,OAAO,MAAM,IAAI,SAAS,EAAE,CAAC;gBAC5B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;YAC5B,CAAC;YACD,IAAI,EAAE,CAAC;QACR,CAAC;QACD,KAAK,CAAC,IAAI;YACT,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;gBAChB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YACzB,CAAC;YACD,IAAI,EAAE,CAAC;QACR,CAAC;QACD,OAAO,CAAC,KAAK,EAAE,IAAI;YAClB,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;YACjB,MAAM,GAAG,CAAC,CAAC;YACX,IAAI,CAAC,KAAK,CAAC,CAAC;QACb,CAAC;KACD,CAAC,CAAC;AACJ,CAAC;AAEY,QAAA,YAAY,GAAG;IAC3B,WAAW,EAAE,CAAC,UAAkB,EAAE,WAAmB,EAA2B,EAAE,CAAC,CAAC;QACnF,IAAI,EAAE,WAAW;QACjB,UAAU;QACV,WAAW;KACX,CAAC;IAMF,QAAQ,EAAE,CAAC,EACV,YAAY,EACZ,UAAU,EACV,QAAQ,GAKR,EAA2B,EAAE,CAAC,CAAC;QAC/B,IAAI,EAAE,QAAQ;QACd,YAAY;QACZ,UAAU;QACV,QAAQ;KACR,CAAC;CACF,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/binary-data/utils.ts"],"names":[],"mappings":";;;;AAEA,sDAAwD;AAA/C,2GAAA,SAAS,OAAA;AAAE,wGAAA,MAAM,OAAA;AAE1B,MAAM,YAAY,GAAG,CAAC,YAAY,EAAE,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,CAAU,CAAC;AAEzF,sBAA6B,IAAY;IACxC,OAAO,YAAY,CAAC,QAAQ,CAAC,IAA6B,CAAC,CAAC;AAC7D,CAAC;AAEY,QAAA,YAAY,GAAG;IAC3B,WAAW,EAAE,CAAC,UAAkB,EAAE,WAAmB,EAA2B,EAAE,CAAC,CAAC;QACnF,IAAI,EAAE,WAAW;QACjB,UAAU;QACV,WAAW;KACX,CAAC;IAMF,QAAQ,EAAE,CAAC,EACV,YAAY,EACZ,UAAU,EACV,QAAQ,GAKR,EAA2B,EAAE,CAAC,CAAC;QAC/B,IAAI,EAAE,QAAQ;QACd,YAAY;QACZ,UAAU;QACV,QAAQ;KACR,CAAC;CACF,CAAC"}