n8n-core 2.6.2 → 2.7.1

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

@@ -1,6 +1,7 @@
 import { ExecutionsConfig } from '@n8n/config';
 import { z } from 'zod';
 import { InstanceSettings } from '../instance-settings';
+import { StorageConfig } from '../storage.config';
 export declare const BINARY_DATA_MODES: readonly ["default", "filesystem", "s3", "database"];
 declare const binaryDataModesSchema: z.ZodEnum<["default", "filesystem", "s3", "database"]>;
 declare const availableModesSchema: z.ZodPipeline<z.ZodEffects<z.ZodString, string[], string>, z.ZodArray<z.ZodEnum<["default", "filesystem", "s3", "database"]>, "many">>;
@@ -10,6 +11,6 @@ export declare class BinaryDataConfig {
     localStoragePath: string;
     signingSecret: string;
     dbMaxFileSize: number;
-    constructor({ encryptionKey, n8nFolder }: InstanceSettings, executionsConfig: ExecutionsConfig);
+    constructor({ encryptionKey }: InstanceSettings, executionsConfig: ExecutionsConfig, storageConfig: StorageConfig);
 }
 export {};

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

@@ -8,16 +8,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 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.BinaryDataConfig = exports.BINARY_DATA_MODES = void 0;
 const config_1 = require("@n8n/config");
 const node_crypto_1 = require("node:crypto");
-const node_path_1 = __importDefault(require("node:path"));
 const zod_1 = require("zod");
 const instance_settings_1 = require("../instance-settings");
+const storage_config_1 = require("../storage.config");
 exports.BINARY_DATA_MODES = ['default', 'filesystem', 's3', 'database'];
 const binaryDataModesSchema = zod_1.z.enum(exports.BINARY_DATA_MODES);
 const availableModesSchema = zod_1.z
@@ -28,10 +25,10 @@ const dbMaxFileSizeSchema = zod_1.z.coerce
     .number()
     .max(1024, 'Binary data max file size in `database` mode cannot exceed 1024 MiB');
 let BinaryDataConfig = class BinaryDataConfig {
-    constructor({ encryptionKey, n8nFolder }, executionsConfig) {
+    constructor({ encryptionKey }, executionsConfig, storageConfig) {
         this.availableModes = ['filesystem', 's3', 'database'];
         this.dbMaxFileSize = 512;
-        this.localStoragePath = node_path_1.default.join(n8nFolder, 'binaryData');
+        this.localStoragePath ??= storageConfig.storagePath;
         this.signingSecret = (0, node_crypto_1.createHash)('sha256')
             .update(`url-signing:${encryptionKey}`)
             .digest('base64');
@@ -57,6 +54,8 @@ __decorate([
 ], BinaryDataConfig.prototype, "dbMaxFileSize", void 0);
 exports.BinaryDataConfig = BinaryDataConfig = __decorate([
     config_1.Config,
-    __metadata("design:paramtypes", [instance_settings_1.InstanceSettings, config_1.ExecutionsConfig])
+    __metadata("design:paramtypes", [instance_settings_1.InstanceSettings,
+        config_1.ExecutionsConfig,
+        storage_config_1.StorageConfig])
 ], BinaryDataConfig);
 //# sourceMappingURL=binary-data.config.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"binary-data.config.js","sourceRoot":"","sources":["../../src/binary-data/binary-data.config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wCAA4D;AAC5D,6CAAyC;AACzC,0DAA6B;AAC7B,6BAAwB;AAExB,2DAAuD;AAE1C,QAAA,iBAAiB,GAAG,CAAC,SAAS,EAAE,YAAY,EAAE,IAAI,EAAE,UAAU,CAAU,CAAC;AAEtF,MAAM,qBAAqB,GAAG,OAAC,CAAC,IAAI,CAAC,yBAAiB,CAAC,CAAC;AAExD,MAAM,oBAAoB,GAAG,OAAC;KAC5B,MAAM,EAAE;KACR,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KACtC,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC,CAAC;AAEtC,MAAM,mBAAmB,GAAG,OAAC,CAAC,MAAM;KAClC,MAAM,EAAE;KACR,GAAG,CAAC,IAAI,EAAE,qEAAqE,CAAC,CAAC;AAG5E,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAuB5B,YAAY,EAAE,aAAa,EAAE,SAAS,EAAoB,EAAE,gBAAkC;QArB9F,mBAAc,GAAyC,CAAC,YAAY,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;QAmBxF,kBAAa,GAAW,GAAG,CAAC;QAG3B,IAAI,CAAC,gBAAgB,GAAG,mBAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QAC3D,IAAI,CAAC,aAAa,GAAG,IAAA,wBAAU,EAAC,QAAQ,CAAC;aACvC,MAAM,CAAC,eAAe,aAAa,EAAE,CAAC;aACtC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAEnB,IAAI,CAAC,IAAI,KAAK,gBAAgB,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC;IAC7E,CAAC;CACD,CAAA;AA/BY,4CAAgB;AAM5B;IADC,IAAA,YAAG,EAAC,8BAA8B,EAAE,qBAAqB,CAAC;;8CACd;AAI7C;IADC,IAAA,YAAG,EAAC,8BAA8B,CAAC;;0DACX;AAOzB;IADC,IAAA,YAAG,EAAC,gCAAgC,CAAC;;uDAChB;AAItB;IADC,IAAA,YAAG,EAAC,wCAAwC,EAAE,mBAAmB,CAAC;;uDACvC;2BArBhB,gBAAgB;IAD5B,eAAM;qCAwBoC,oCAAgB,EAAoB,yBAAgB;GAvBlF,gBAAgB,CA+B5B"}
+{"version":3,"file":"binary-data.config.js","sourceRoot":"","sources":["../../src/binary-data/binary-data.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA4D;AAC5D,6CAAyC;AACzC,6BAAwB;AAExB,2DAAuD;AACvD,qDAAiD;AAEpC,QAAA,iBAAiB,GAAG,CAAC,SAAS,EAAE,YAAY,EAAE,IAAI,EAAE,UAAU,CAAU,CAAC;AAEtF,MAAM,qBAAqB,GAAG,OAAC,CAAC,IAAI,CAAC,yBAAiB,CAAC,CAAC;AAExD,MAAM,oBAAoB,GAAG,OAAC;KAC5B,MAAM,EAAE;KACR,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KACtC,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC,CAAC;AAEtC,MAAM,mBAAmB,GAAG,OAAC,CAAC,MAAM;KAClC,MAAM,EAAE;KACR,GAAG,CAAC,IAAI,EAAE,qEAAqE,CAAC,CAAC;AAG5E,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAuB5B,YACC,EAAE,aAAa,EAAoB,EACnC,gBAAkC,EAClC,aAA4B;QAxB7B,mBAAc,GAAyC,CAAC,YAAY,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;QAmBxF,kBAAa,GAAW,GAAG,CAAC;QAgB3B,IAAI,CAAC,gBAAgB,KAAK,aAAa,CAAC,WAAW,CAAC;QACpD,IAAI,CAAC,aAAa,GAAG,IAAA,wBAAU,EAAC,QAAQ,CAAC;aACvC,MAAM,CAAC,eAAe,aAAa,EAAE,CAAC;aACtC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAEnB,IAAI,CAAC,IAAI,KAAK,gBAAgB,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC;IAC7E,CAAC;CACD,CAAA;AA5CY,4CAAgB;AAM5B;IADC,IAAA,YAAG,EAAC,8BAA8B,EAAE,qBAAqB,CAAC;;8CACd;AAI7C;IADC,IAAA,YAAG,EAAC,8BAA8B,CAAC;;0DACX;AAOzB;IADC,IAAA,YAAG,EAAC,gCAAgC,CAAC;;uDAChB;AAItB;IADC,IAAA,YAAG,EAAC,wCAAwC,EAAE,mBAAmB,CAAC;;uDACvC;2BArBhB,gBAAgB;IAD5B,eAAM;qCAyBc,oCAAgB;QACjB,yBAAgB;QACnB,8BAAa;GA1BjB,gBAAgB,CA4C5B"}

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

@@ -1,5 +1,4 @@
 export * from './binary-data.service';
 export { BinaryDataConfig } from './binary-data.config';
 export type * from './types';
-export { ObjectStoreService } from './object-store/object-store.service.ee';
 export { isStoredMode as isValidNonDefaultMode, FileLocation, binaryToBuffer } from './utils';

package/dist/binary-data/index.js

@@ -14,12 +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.binaryToBuffer = exports.FileLocation = exports.isValidNonDefaultMode = exports.ObjectStoreService = exports.BinaryDataConfig = void 0;
+exports.binaryToBuffer = exports.FileLocation = exports.isValidNonDefaultMode = exports.BinaryDataConfig = void 0;
 __exportStar(require("./binary-data.service"), exports);
 var binary_data_config_1 = require("./binary-data.config");
 Object.defineProperty(exports, "BinaryDataConfig", { enumerable: true, get: function () { return binary_data_config_1.BinaryDataConfig; } });
-var object_store_service_ee_1 = require("./object-store/object-store.service.ee");
-Object.defineProperty(exports, "ObjectStoreService", { enumerable: true, get: function () { return object_store_service_ee_1.ObjectStoreService; } });
 var utils_1 = require("./utils");
 Object.defineProperty(exports, "isValidNonDefaultMode", { enumerable: true, get: function () { return utils_1.isStoredMode; } });
 Object.defineProperty(exports, "FileLocation", { enumerable: true, get: function () { return utils_1.FileLocation; } });

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;AAEzB,kFAA4E;AAAnE,6HAAA,kBAAkB,OAAA;AAC3B,iCAA8F;AAArF,8GAAA,YAAY,OAAyB;AAAE,qGAAA,YAAY,OAAA;AAAE,uGAAA,cAAc,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/binary-data/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,wDAAsC;AACtC,2DAAwD;AAA/C,sHAAA,gBAAgB,OAAA;AAEzB,iCAA8F;AAArF,8GAAA,YAAY,OAAyB;AAAE,qGAAA,YAAY,OAAA;AAAE,uGAAA,cAAc,OAAA"}