npm - n8n - Versions diffs - 2.24.0 → 2.25.2 - Mend

n8n 2.24.0 → 2.25.2

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 (39) hide show

package/dist/commands/import/workflow.js CHANGED Viewed

@@ -86,13 +86,17 @@ let ImportWorkflowsCommand = class ImportWorkflowsCommand extends base_command_1
             throw new n8n_workflow_1.UserError('You cannot use `--userId` and `--projectId` together. Use one or the other.');
         }
         const project = await this.getProject(flags.userId, flags.projectId);
+        const ownerUser = await di_1.Container.get(db_1.UserRepository).findOneByOrFail({
+            role: { slug: db_1.GLOBAL_OWNER_ROLE.slug },
+        });
+        const userId = flags.userId ?? ownerUser.id;
         const workflows = await this.readWorkflows(flags.input, flags.separate);
         const result = await this.checkRelations(workflows, flags.projectId, flags.userId);
         if (!result.success) {
             throw new n8n_workflow_1.UserError(result.message);
         }
         this.logger.info(`Importing ${workflows.length} workflows...`);
-        await di_1.Container.get(import_service_1.ImportService).importWorkflows(workflows, project.id, {
+        await di_1.Container.get(import_service_1.ImportService).importWorkflows(workflows, project.id, userId, {
             activeState: flags.activeState,
         });
         this.reportSuccess(workflows.length);

package/dist/commands/import/workflow.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"workflow.js","sourceRoot":"","sources":["../../../src/commands/import/workflow.ts"],"names":[],"mappings":"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~~YACzE~~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~~AA7LY~~,wDAAsB;iCAAtB,sBAAsB;IAblC,IAAA,oBAAO,EAAC;QACR,IAAI,EAAE,iBAAiB;QACvB,WAAW,EAAE,kBAAkB;QAC/B,QAAQ,EAAE;YACT,mBAAmB;YACnB,oCAAoC;YACpC,iEAAiE;YACjE,gDAAgD;YAChD,kFAAkF;YAClF,0CAA0C;SAC1C;QACD,WAAW;KACX,CAAC;GACW,sBAAsB,~~CA6LlC~~"}
1	+ {"version":3,"file":"workflow.js","sourceRoot":"","sources":["../../../src/commands/import/workflow.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAOiB;AACjB,gDAA0C;AAC1C,gCAAoC;AACpC,kDAA2D;AAC3D,0DAA6B;AAC7B,4CAAoB;AAEpB,+CAAoD;AACpD,6BAAwB;AAExB,kDAA8C;AAE9C,2CAAiD;AAEjD,8DAA0D;AAE1D,SAAS,0BAA0B,CAClC,SAAoB;IAEpB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QAClC,IACC,OAAO,QAAQ,KAAK,QAAQ;YAC5B,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC;YACxD,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,EAC7D,CAAC;YACF,MAAM,IAAI,wBAAS,CAAC,gDAAgD,CAAC,CAAC;QACvE,CAAC;IACF,CAAC;AACF,CAAC;AAKD,SAAS,kCAAkC,CAC1C,kBAAsC,EACtC,SAA8B;IAE9B,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC9D,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QAChD,GAAG,OAAO;QACV,eAAe,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,eAAe;KACjD,CAAC,CAAC,CAAC;AACL,CAAC;AAKD,SAAS,iCAAiC,CACzC,kBAAsC,EACtC,QAA2B;IAE3B,OAAO,kCAAkC,CAAC,kBAAkB,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,WAAW,GAAG,OAAC,CAAC,MAAM,CAAC;IAC5B,KAAK,EAAE,OAAC;SACN,MAAM,EAAE;SACR,KAAK,CAAC,GAAG,CAAC;SACV,QAAQ,CAAC,oDAAoD,CAAC;SAC9D,QAAQ,EAAE;IACZ,QAAQ,EAAE,OAAC;SACT,OAAO,EAAE;SACT,QAAQ,CAAC,yDAAyD,CAAC;SACnE,OAAO,CAAC,KAAK,CAAC;IAChB,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,wDAAwD,CAAC,CAAC,QAAQ,EAAE;IAChG,SAAS,EAAE,OAAC;SACV,MAAM,EAAE;SACR,QAAQ,CAAC,2DAA2D,CAAC;SACrE,QAAQ,EAAE;IACZ,WAAW,EAAE,OAAC;SACZ,IAAI,CAAC,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE;QAC5B,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YAChB,OAAO,EAAE,uEAAuE;SAChF,CAAC;KACF,CAAC;SACD,QAAQ,CACR,gLAAgL,CAChL;SACA,OAAO,CAAC,OAAO,CAAC;CAClB,CAAC,CAAC;AAeI,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,0BAAwC;IACnF,KAAK,CAAC,GAAG;QACR,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QAEvB,IAAI,KAAK,CAAC,WAAW,KAAK,UAAU,IAAI,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACvF,MAAM,IAAI,wBAAS,CAClB,uKAAuK,CACvK,CAAC;QACH,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;YAC7E,OAAO;QACR,CAAC;QAED,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACpB,IAAI,YAAE,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;gBAChC,IAAI,CAAC,YAAE,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;oBAC9C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;oBAChE,OAAO;gBACR,CAAC;YACF,CAAC;QACF,CAAC;QAED,IAAI,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACrC,MAAM,IAAI,wBAAS,CAClB,6EAA6E,CAC7E,CAAC;QACH,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;QAErE,MAAM,SAAS,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,mBAAc,CAAC,CAAC,eAAe,CAAC;YACrE,IAAI,EAAE,EAAE,IAAI,EAAE,sBAAiB,CAAC,IAAI,EAAE;SACtC,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,SAAS,CAAC,EAAE,CAAC;QAE5C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAExE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAEnF,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACrB,MAAM,IAAI,wBAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACrC,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,SAAS,CAAC,MAAM,eAAe,CAAC,CAAC;QAE/D,MAAM,cAAS,CAAC,GAAG,CAAC,8BAAa,CAAC,CAAC,eAAe,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE;YACjF,WAAW,EAAE,KAAK,CAAC,WAAW;SAC9B,CAAC,CAAC;QAEH,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,SAA0B,EAAE,SAAkB,EAAE,MAAe;QAE3F,IAAI,CAAC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;YAC3B,OAAO;gBACN,OAAO,EAAE,IAAa;gBACtB,OAAO,EAAE,SAAS;aAClB,CAAC;QACH,CAAC;QAED,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAClC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;gBAC/C,SAAS;YACV,CAAC;YAED,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAEjF,IAAI,CAAC,YAAY,EAAE,CAAC;gBACnB,SAAS;YACV,CAAC;YAED,IAAI,YAAY,CAAC,EAAE,KAAK,SAAS,EAAE,CAAC;gBACnC,MAAM,YAAY,GACjB,YAAY,CAAC,IAAI,KAAK,UAAU;oBAC/B,CAAC,CAAC,yBAAyB,IAAI,CAAC,EAAE,GAAG;oBACrC,CAAC,CAAC,4BAA4B,YAAY,CAAC,EAAE,GAAG,CAAC;gBACnD,MAAM,QAAQ,GAAG,MAAM;oBACtB,CAAC;wBAEA,yBAAyB,MAAM,GAAG;oBACnC,CAAC,CAAC,4BAA4B,SAAS,GAAG,CAAC;gBAE5C,OAAO;oBACN,OAAO,EAAE,KAAc;oBACvB,OAAO,EAAE,2BAA2B,QAAQ,CAAC,EAAE,yBAAyB,YAAY,6BAA6B,QAAQ,GAAG;iBAC5H,CAAC;YACH,CAAC;QACF,CAAC;QAED,OAAO;YACN,OAAO,EAAE,IAAa;YACtB,OAAO,EAAE,SAAS;SAClB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAAY;QACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4EAA4E,CAAC,CAAC;QAChG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAEO,aAAa,CAAC,KAAa;QAClC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,KAAK,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;IAChG,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,UAAsB;QACpD,MAAM,OAAO,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,6BAAwB,CAAC,CAAC,OAAO,CAAC;YACrE,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,gBAAgB,EAAE;YAC7C,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;SAC5B,CAAC,CAAC;QAEH,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YACpD,MAAM,IAAI,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,mBAAc,CAAC,CAAC,eAAe,CAAC;gBAChE,gBAAgB,EAAE;oBACjB,IAAI,EAAE,EAAE,IAAI,EAAE,qCAAuB,EAAE;oBACvC,SAAS,EAAE,OAAO,CAAC,SAAS;iBAC5B;aACD,CAAC,CAAC;YAEH,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3C,CAAC;QAED,OAAO,EAAE,CAAC;IACX,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,UAAsB;QAClD,OAAO,MAAM,cAAS,CAAC,GAAG,CAAC,uBAAkB,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;IAC7E,CAAC;IAEO,KAAK,CAAC,aAAa,CAC1B,IAAY,EACZ,QAAiB;QAEjB,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;YAClC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACjC,CAAC;QAED,MAAM,kBAAkB,GAAG,cAAS,CAAC,GAAG,CAAC,uBAAkB,CAAC,CAAC;QAE7D,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,MAAM,SAAS,GAAG,IAAA,wBAAS,EAC1B,YAAE,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAC3C,CAAC;YACF,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YAC1E,0BAA0B,CAAC,cAAc,CAAC,CAAC;YAE3C,OAAO,kCAAkC,CAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;QAC/E,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,IAAA,mBAAI,EAAC,QAAQ,EAAE;YAClC,GAAG,EAAE,IAAI;YACT,QAAQ,EAAE,IAAI;SACd,CAAC,CAAC;QAEH,MAAM,SAAS,GAAmC,EAAE,CAAC;QAErD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YAC1B,MAAM,QAAQ,GAAG,IAAA,wBAAS,EAAoB,YAAE,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;YAC3F,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBAClB,QAAQ,CAAC,EAAE,GAAG,IAAA,mBAAc,GAAE,CAAC;YAChC,CAAC;YAED,IAAI,CAAC;gBACJ,0BAA0B,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAEvC,SAAS,CAAC,IAAI,CAAC,iCAAiC,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC,CAAC;YACjF,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAmC,IAAI,EAAE,CAAC,CAAC;gBAC5D,SAAS;YACV,CAAC;QACF,CAAC;QAED,OAAO,SAAS,CAAC;IAClB,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,MAAe,EAAE,SAAkB;QAC3D,IAAI,SAAS,EAAE,CAAC;YACf,OAAO,MAAM,cAAS,CAAC,GAAG,CAAC,sBAAiB,CAAC,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QAClF,CAAC;QAED,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,MAAM,KAAK,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,mBAAc,CAAC,CAAC,SAAS,CAAC;gBAC3D,IAAI,EAAE,EAAE,IAAI,EAAE,sBAAiB,CAAC,IAAI,EAAE;aACtC,CAAC,CAAC;YACH,IAAI,CAAC,KAAK,EAAE,CAAC;gBACZ,MAAM,IAAI,wBAAS,CAAC,yBAAyB,8BAAkB,EAAE,CAAC,CAAC;YACpE,CAAC;YACD,MAAM,GAAG,KAAK,CAAC,EAAE,CAAC;QACnB,CAAC;QAED,OAAO,MAAM,cAAS,CAAC,GAAG,CAAC,sBAAiB,CAAC,CAAC,+BAA+B,CAAC,MAAM,CAAC,CAAC;IACvF,CAAC;CACD,CAAA;AAnMY,wDAAsB;iCAAtB,sBAAsB;IAblC,IAAA,oBAAO,EAAC;QACR,IAAI,EAAE,iBAAiB;QACvB,WAAW,EAAE,kBAAkB;QAC/B,QAAQ,EAAE;YACT,mBAAmB;YACnB,oCAAoC;YACpC,iEAAiE;YACjE,gDAAgD;YAChD,kFAAkF;YAClF,0CAA0C;SAC1C;QACD,WAAW;KACX,CAAC;GACW,sBAAsB,CAmMlC"}

package/dist/executions/execution-data/db-store.d.ts CHANGED Viewed

@@ -6,6 +6,7 @@ export declare class DbStore implements ExecutionDataStore {
     constructor(repository: ExecutionDataRepository);
     write({ executionId }: ExecutionRef, payload: ExecutionDataPayload, tx?: EntityManager): Promise<void>;
     read({ executionId }: ExecutionRef, tx?: EntityManager): Promise<ExecutionDataBundle | null>;
+    readMany(refs: ExecutionRef[]): Promise<Map<string, ExecutionDataBundle>>;
     delete(ref: ExecutionRef | ExecutionRef[]): Promise<void>;
     private getRepository;
 }

package/dist/executions/execution-data/db-store.js CHANGED Viewed

@@ -8,11 +8,16 @@ 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.DbStore = void 0;
 const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
+const chunk_1 = __importDefault(require("lodash/chunk"));
 const constants_1 = require("./constants");
+const MAX_READ_BATCH_SIZE = 900;
 let DbStore = class DbStore {
     constructor(repository) {
         this.repository = repository;
@@ -31,6 +36,27 @@ let DbStore = class DbStore {
             return null;
         return { ...result, version: constants_1.EXECUTION_DATA_BUNDLE_VERSION };
     }
+    async readMany(refs) {
+        const bundles = new Map();
+        if (refs.length === 0)
+            return bundles;
+        const ids = refs.map((r) => r.executionId);
+        for (const batch of (0, chunk_1.default)(ids, MAX_READ_BATCH_SIZE)) {
+            const rows = await this.repository.find({
+                where: { executionId: (0, db_1.In)(batch) },
+                select: ['executionId', 'data', 'workflowData', 'workflowVersionId'],
+            });
+            for (const row of rows) {
+                bundles.set(row.executionId, {
+                    data: row.data,
+                    workflowData: row.workflowData,
+                    workflowVersionId: row.workflowVersionId,
+                    version: constants_1.EXECUTION_DATA_BUNDLE_VERSION,
+                });
+            }
+        }
+        return bundles;
+    }
     async delete(ref) {
         const ids = (Array.isArray(ref) ? ref : [ref]).map((r) => r.executionId);
         await this.repository.deleteMany(ids);

package/dist/executions/execution-data/db-store.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"db-store.js","sourceRoot":"","sources":["../../../src/executions/execution-data/db-store.ts"],"names":[],"mappings":"~~;;;;;;;;;;;;~~AAAA,~~gCAAiE~~;~~AAEjE~~,gCAAkC;~~AAElC~~,2CAA4D;~~AASrD~~,IAAM,OAAO,GAAb,MAAM,OAAO;IACnB,YAA6B,UAAmC;QAAnC,eAAU,GAAV,UAAU,CAAyB;IAAG,CAAC;IAEpE,KAAK,CAAC,KAAK,CAAC,EAAE,WAAW,EAAgB,EAAE,OAA6B,EAAE,EAAkB;QAC3F,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QACpC,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,OAAO,EAAE,WAAW,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,IAAI,CACT,EAAE,WAAW,EAAgB,EAC7B,EAAkB;QAElB,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC;YACjC,KAAK,EAAE,EAAE,WAAW,EAAE;YACtB,MAAM,EAAE,CAAC,MAAM,EAAE,cAAc,EAAE,mBAAmB,CAAC;SACrD,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEzB,OAAO,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,yCAA6B,EAAE,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAkC;QAC9C,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QAEzE,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACvC,CAAC;IAEO,aAAa,CAAC,EAAkB;QACvC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,kBAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC;IAC/D,CAAC;CACD,CAAA;~~AAhCY~~,0BAAO;kBAAP,OAAO;IADnB,IAAA,YAAO,GAAE;qCAEgC,4BAAuB;GADpD,OAAO,~~CAgCnB~~"}
1	+ {"version":3,"file":"db-store.js","sourceRoot":"","sources":["../../../src/executions/execution-data/db-store.ts"],"names":[],"mappings":"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"}

package/dist/executions/execution-data/fs-store.d.ts CHANGED Viewed

@@ -7,8 +7,10 @@ export declare class FsStore implements ExecutionDataStore {
     init(): Promise<void>;
     write(ref: ExecutionRef, payload: ExecutionDataPayload): Promise<void>;
     read(ref: ExecutionRef): Promise<ExecutionDataBundle | null>;
+    readMany(refs: ExecutionRef[]): Promise<Map<string, ExecutionDataBundle>>;
     delete(ref: ExecutionRef | ExecutionRef[]): Promise<void>;
     private resolveExecutionDir;
     private resolveBundlePath;
     private isFileNotFound;
+    private tryRead;
 }

package/dist/executions/execution-data/fs-store.js CHANGED Viewed

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FsStore = void 0;
 const backend_common_1 = require("@n8n/backend-common");
 const di_1 = require("@n8n/di");
+const chunk_1 = __importDefault(require("lodash/chunk"));
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const promises_1 = __importDefault(require("node:fs/promises"));
@@ -22,6 +23,7 @@ const node_path_1 = __importDefault(require("node:path"));
 const constants_1 = require("./constants");
 const corrupted_execution_data_error_1 = require("./corrupted-execution-data.error");
 const execution_data_write_error_1 = require("./execution-data-write.error");
+const MAX_READ_CONCURRENCY = 50;
 let FsStore = class FsStore {
     constructor(storageConfig, errorReporter) {
         this.storageConfig = storageConfig;
@@ -66,6 +68,19 @@ let FsStore = class FsStore {
             throw new corrupted_execution_data_error_1.CorruptedExecutionDataError(ref, error);
         }
     }
+    async readMany(refs) {
+        const bundles = new Map();
+        if (refs.length === 0)
+            return bundles;
+        for (const batch of (0, chunk_1.default)(refs, MAX_READ_CONCURRENCY)) {
+            const bundlesInBatch = await Promise.all(batch.map(async (ref) => await this.tryRead(ref)));
+            for (const [idx, bundle] of bundlesInBatch.entries()) {
+                if (bundle)
+                    bundles.set(batch[idx].executionId, bundle);
+            }
+        }
+        return bundles;
+    }
     async delete(ref) {
         const refs = Array.isArray(ref) ? ref : [ref];
         await Promise.all(refs.map(async (r) => await promises_1.default.rm(this.resolveExecutionDir(r), { recursive: true, force: true })));
@@ -79,6 +94,18 @@ let FsStore = class FsStore {
     isFileNotFound(error) {
         return (error !== null && typeof error === 'object' && 'code' in error && error.code === 'ENOENT');
     }
+    async tryRead(ref) {
+        try {
+            return await this.read(ref);
+        }
+        catch (error) {
+            if (error instanceof corrupted_execution_data_error_1.CorruptedExecutionDataError) {
+                this.errorReporter.error(error);
+                return null;
+            }
+            throw error;
+        }
+    }
 };
 exports.FsStore = FsStore;
 exports.FsStore = FsStore = __decorate([

package/dist/executions/execution-data/fs-store.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fs-store.js","sourceRoot":"","sources":["../../../src/executions/execution-data/fs-store.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAAgD;AAChD,gCAAkC;AAClC,uCAAwD;AACxD,+CAAwD;AACxD,gEAAkC;AAClC,0DAA6B;AAE7B,2CAA4F;AAC5F,qFAA+E;AAC/E,6EAAuE;~~AAShE~~,IAAM,OAAO,GAAb,MAAM,OAAO;IACnB,YACkB,aAA4B,EAC5B,aAA4B;QAD5B,kBAAa,GAAb,aAAa,CAAe;QAC5B,kBAAa,GAAb,aAAa,CAAe;IAC3C,CAAC;IAEJ,KAAK,CAAC,IAAI;QACT,MAAM,IAAA,0BAAS,EAAC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAiB,EAAE,OAA6B;QAC3D,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QAC9C,MAAM,IAAA,0BAAS,EAAC,mBAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;QAGzC,MAAM,QAAQ,GAAG,GAAG,SAAS,QAAQ,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;QAClD,IAAI,OAAO,GAAG,KAAK,CAAC;QAEpB,IAAI,CAAC;YACJ,MAAM,kBAAE,CAAC,SAAS,CACjB,QAAQ,EACR,IAAA,4BAAa,EAAC,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,yCAA6B,EAAE,CAAC,EACrE,OAAO,CACP,CAAC;YACF,MAAM,kBAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YACrC,OAAO,GAAG,IAAI,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,oDAAuB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC/C,CAAC;gBAAS,CAAC;YACV,IAAI,CAAC,OAAO;gBACX,MAAM,kBAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACnF,CAAC;IACF,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAiB;QAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QAE/C,IAAI,OAAe,CAAC;QAEpB,IAAI,CAAC;YACJ,OAAO,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAClD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC;gBAAE,OAAO,IAAI,CAAC;YAC5C,MAAM,KAAK,CAAC;QACb,CAAC;QAED,IAAI,CAAC;YACJ,OAAO,IAAA,wBAAS,EAAsB,OAAO,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,4DAA2B,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACnD,CAAC;IACF,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAkC;QAC9C,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAE9C,MAAM,OAAO,CAAC,GAAG,CAChB,IAAI,CAAC,GAAG,CACP,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,MAAM,kBAAE,CAAC,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CACvF,CACD,CAAC;IACH,CAAC;IAEO,mBAAmB,CAAC,EAAE,UAAU,EAAE,WAAW,EAAgB;QACpE,OAAO,mBAAI,CAAC,IAAI,CACf,IAAI,CAAC,aAAa,CAAC,WAAW,EAC9B,WAAW,EACX,UAAU,EACV,YAAY,EACZ,WAAW,CACX,CAAC;IACH,CAAC;IAEO,iBAAiB,CAAC,GAAiB;QAC1C,OAAO,mBAAI,CAAC,IAAI,CACf,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,EAC7B,gBAAgB,EAChB,0CAA8B,CAC9B,CAAC;IACH,CAAC;IAEO,cAAc,CAAC,KAAc;QACpC,OAAO,CACN,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,CACzF,CAAC;IACH,CAAC;CACD,CAAA;~~AAtFY~~,0BAAO;kBAAP,OAAO;IADnB,IAAA,YAAO,GAAE;qCAGwB,wBAAa;QACb,wBAAa;GAHlC,OAAO,~~CAsFnB~~"}
1	+ {"version":3,"file":"fs-store.js","sourceRoot":"","sources":["../../../src/executions/execution-data/fs-store.ts"],"names":[],"mappings":"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"}

package/dist/executions/execution-data/types.d.ts CHANGED Viewed

@@ -18,5 +18,6 @@ export interface ExecutionDataStore {
     init?(): Promise<void>;
     write(ref: ExecutionRef, payload: ExecutionDataPayload, tx?: EntityManager): Promise<void>;
     read(ref: ExecutionRef, tx?: EntityManager): Promise<ExecutionDataBundle | null>;
+    readMany(refs: ExecutionRef[]): Promise<Map<string, ExecutionDataBundle>>;
     delete(ref: ExecutionRef | ExecutionRef[]): Promise<void>;
 }

package/dist/executions/execution-persistence.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import { DatabaseConfig, ExecutionsConfig } from '@n8n/config';
-import type { CreateExecutionPayload, ExecutionDataStorageLocation, ExecutionDeletionCriteria, IExecutionResponse, UpdateExecutionConditions } from '@n8n/db';
-import { ExecutionRepository } from '@n8n/db';
-import { BinaryDataService, StorageConfig } from 'n8n-core';
+import type { CreateExecutionPayload, ExecutionDataStorageLocation, ExecutionDeletionCriteria, FindManyOptions, FindOptionsWhere, IExecutionBase, IExecutionFlattedDb, IExecutionResponse, UpdateExecutionConditions } from '@n8n/db';
+import { ExecutionEntity, ExecutionRepository } from '@n8n/db';
+import { BinaryDataService, ErrorReporter, StorageConfig } from 'n8n-core';
 import { DbStore } from './execution-data/db-store';
 import { FsStore } from './execution-data/fs-store';
 import type { ExecutionRef } from './execution-data/types';
@@ -16,9 +16,40 @@ export declare class ExecutionPersistence {
     private readonly storageConfig;
     private readonly executionsConfig;
     private readonly databaseConfig;
-    constructor(executionRepository: ExecutionRepository, binaryDataService: BinaryDataService, fsStore: FsStore, dbStore: DbStore, storageConfig: StorageConfig, executionsConfig: ExecutionsConfig, databaseConfig: DatabaseConfig);
+    private readonly errorReporter;
+    constructor(executionRepository: ExecutionRepository, binaryDataService: BinaryDataService, fsStore: FsStore, dbStore: DbStore, storageConfig: StorageConfig, executionsConfig: ExecutionsConfig, databaseConfig: DatabaseConfig, errorReporter: ErrorReporter);
     create(payload: CreateExecutionPayload): Promise<string>;
     updateExistingExecution(executionId: string, execution: Partial<IExecutionResponse>, conditions?: UpdateExecutionConditions): Promise<boolean>;
+    findSingleExecution(id: string, options?: {
+        includeData: true;
+        includeAnnotation?: boolean;
+        unflattenData: true;
+        where?: FindOptionsWhere<ExecutionEntity>;
+    }): Promise<IExecutionResponse | undefined>;
+    findSingleExecution(id: string, options?: {
+        includeData: true;
+        includeAnnotation?: boolean;
+        unflattenData?: false | undefined;
+        where?: FindOptionsWhere<ExecutionEntity>;
+    }): Promise<IExecutionFlattedDb | undefined>;
+    findSingleExecution(id: string, options?: {
+        includeData?: boolean;
+        includeAnnotation?: boolean;
+        unflattenData?: boolean;
+        where?: FindOptionsWhere<ExecutionEntity>;
+    }): Promise<IExecutionBase | undefined>;
+    findMultipleExecutions(queryParams: FindManyOptions<ExecutionEntity>, options?: {
+        unflattenData: true;
+        includeData?: true;
+    }): Promise<IExecutionResponse[]>;
+    findMultipleExecutions(queryParams: FindManyOptions<ExecutionEntity>, options?: {
+        unflattenData?: false | undefined;
+        includeData?: true;
+    }): Promise<IExecutionFlattedDb[]>;
+    findMultipleExecutions(queryParams: FindManyOptions<ExecutionEntity>, options?: {
+        unflattenData?: boolean;
+        includeData?: boolean;
+    }): Promise<IExecutionBase[]>;
     deleteInFlightExecution(target: DeletionTarget): Promise<void>;
     hardDelete(target: DeletionTarget | DeletionTarget[]): Promise<void>;
     hardDeleteBy(criteria: ExecutionDeletionCriteria): Promise<void>;
@@ -28,6 +59,9 @@ export declare class ExecutionPersistence {
     private buildEntityWhereCondition;
     private getStoreFor;
     private toWorkflowSnapshot;
+    private assembleExecution;
+    private parseExecutionData;
+    private serializeAnnotation;
     private isDuplicateExecutionError;
 }
 export {};

package/dist/executions/execution-persistence.js CHANGED Viewed

@@ -10,6 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExecutionPersistence = void 0;
+const backend_common_1 = require("@n8n/backend-common");
 const config_1 = require("@n8n/config");
 const constants_1 = require("@n8n/constants");
 const db_1 = require("@n8n/db");
@@ -22,7 +23,7 @@ const fs_store_1 = require("./execution-data/fs-store");
 const missing_execution_data_error_1 = require("./execution-data/missing-execution-data.error");
 const duplicate_execution_error_1 = require("../errors/duplicate-execution.error");
 let ExecutionPersistence = class ExecutionPersistence {
-    constructor(executionRepository, binaryDataService, fsStore, dbStore, storageConfig, executionsConfig, databaseConfig) {
+    constructor(executionRepository, binaryDataService, fsStore, dbStore, storageConfig, executionsConfig, databaseConfig, errorReporter) {
         this.executionRepository = executionRepository;
         this.binaryDataService = binaryDataService;
         this.fsStore = fsStore;
@@ -30,6 +31,7 @@ let ExecutionPersistence = class ExecutionPersistence {
         this.storageConfig = storageConfig;
         this.executionsConfig = executionsConfig;
         this.databaseConfig = databaseConfig;
+        this.errorReporter = errorReporter;
     }
     async create(payload) {
         const { data: rawData, workflowData, ...rest } = payload;
@@ -71,6 +73,86 @@ let ExecutionPersistence = class ExecutionPersistence {
         const store = this.getStoreFor(entity.storedAt);
         return await this.applyDataUpdate(ref, store, execution, conditions);
     }
+    async findSingleExecution(id, options) {
+        if (!options?.includeData) {
+            return await this.executionRepository.findSingleExecution(id, options);
+        }
+        const entity = await this.executionRepository.findOne({
+            where: { id, ...options.where },
+            relations: {
+                metadata: true,
+                ...(options.includeAnnotation ? { annotation: { tags: true } } : {}),
+            },
+        });
+        if (!entity)
+            return undefined;
+        const store = this.getStoreFor(entity.storedAt);
+        const bundle = await store.read({ workflowId: entity.workflowId, executionId: entity.id });
+        if (!bundle) {
+            if (entity.storedAt === 'db') {
+                this.executionRepository.reportInvalidExecutions([entity]);
+                return undefined;
+            }
+            throw new missing_execution_data_error_1.MissingExecutionDataError({
+                workflowId: entity.workflowId,
+                executionId: entity.id,
+            });
+        }
+        return (await this.assembleExecution(entity, bundle, options));
+    }
+    async findMultipleExecutions(queryParams, options) {
+        if (!options?.includeData) {
+            return await this.executionRepository.findMultipleExecutions(queryParams, options);
+        }
+        queryParams.relations ??= [];
+        if (Array.isArray(queryParams.relations)) {
+            if (!queryParams.relations.includes('metadata'))
+                queryParams.relations.push('metadata');
+        }
+        else {
+            queryParams.relations.metadata = true;
+        }
+        if (queryParams.select) {
+            if (Array.isArray(queryParams.select)) {
+                for (const field of ['id', 'workflowId', 'storedAt']) {
+                    if (!queryParams.select.includes(field))
+                        queryParams.select.push(field);
+                }
+            }
+            else {
+                queryParams.select.id = true;
+                queryParams.select.workflowId = true;
+                queryParams.select.storedAt = true;
+            }
+        }
+        const entities = await this.executionRepository.find(queryParams);
+        if (entities.length === 0)
+            return [];
+        const entitiesByLocation = new Map();
+        for (const entity of entities) {
+            const group = entitiesByLocation.get(entity.storedAt) ?? [];
+            group.push(entity);
+            entitiesByLocation.set(entity.storedAt, group);
+        }
+        const bundlesById = new Map();
+        await Promise.all([...entitiesByLocation].map(async ([location, group]) => {
+            const refs = group.map((e) => ({ workflowId: e.workflowId, executionId: e.id }));
+            const bundles = await this.getStoreFor(location).readMany(refs);
+            for (const [id, bundle] of bundles)
+                bundlesById.set(id, bundle);
+        }));
+        const invalidEntities = entities.filter((e) => !bundlesById.has(e.id));
+        if (invalidEntities.length > 0) {
+            this.executionRepository.reportInvalidExecutions(invalidEntities);
+        }
+        const assembled = await Promise.all(entities.map(async (entity) => {
+            const bundle = bundlesById.get(entity.id);
+            if (!bundle)
+                return null;
+            return await this.assembleExecution(entity, bundle, options);
+        }));
+        return assembled.filter((e) => e !== null);
+    }
     async deleteInFlightExecution(target) {
         if (this.executionsConfig.pruneData) {
             const bufferMs = this.executionsConfig.pruneDataHardDeleteBuffer * constants_1.Time.hours.toMilliseconds;
@@ -165,6 +247,44 @@ let ExecutionPersistence = class ExecutionPersistence {
         const { id, name, nodes, connections, settings } = workflowData;
         return { id, name, nodes, connections, settings };
     }
+    async assembleExecution(entity, bundle, options) {
+        const { metadata, annotation, ...rest } = entity;
+        const data = await this.parseExecutionData(bundle.data, options);
+        const serializedAnnotation = this.serializeAnnotation(annotation);
+        if (entity.status === 'success' && bundle.data === '[]') {
+            this.errorReporter.error('Found successful execution where data is empty stringified array', {
+                extra: { executionId: entity.id, workflowId: bundle.workflowData.id },
+            });
+        }
+        return {
+            ...rest,
+            data,
+            workflowData: bundle.workflowData,
+            workflowVersionId: bundle.workflowVersionId ?? null,
+            customData: Object.fromEntries(metadata.map((m) => [m.key, m.value])),
+            ...(options.includeAnnotation && serializedAnnotation
+                ? { annotation: serializedAnnotation }
+                : {}),
+        };
+    }
+    async parseExecutionData(data, options) {
+        if (!options.unflattenData)
+            return data;
+        const deserialized = await (0, backend_common_1.parseFlatted)(data);
+        if (!deserialized)
+            return undefined;
+        return (0, n8n_workflow_1.migrateRunExecutionData)(deserialized);
+    }
+    serializeAnnotation(annotation) {
+        if (!annotation)
+            return null;
+        const { id, vote, tags } = annotation;
+        return {
+            id,
+            vote,
+            tags: tags?.map(({ id, name }) => ({ id, name })) ?? [],
+        };
+    }
     isDuplicateExecutionError(error) {
         if (!(error instanceof Error) || !('driverError' in error))
             return false;
@@ -193,6 +313,7 @@ exports.ExecutionPersistence = ExecutionPersistence = __decorate([
         db_store_1.DbStore,
         n8n_core_1.StorageConfig,
         config_1.ExecutionsConfig,
-        config_1.DatabaseConfig])
+        config_1.DatabaseConfig,
+        n8n_core_1.ErrorReporter])
 ], ExecutionPersistence);
 //# sourceMappingURL=execution-persistence.js.map

package/dist/executions/execution-persistence.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"execution-persistence.js","sourceRoot":"","sources":["../../src/executions/execution-persistence.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA+D;AAC/D,8CAAsC;AAStC,gCAAoE;AACpE,gCAAkC;AAClC,qCAAoC;AACpC,uCAA4D;AAC5D,+CAA+C;AAE/C,wDAAoD;AACpD,wDAAoD;AACpD,gGAA0F;AAE1F,mFAA8E;AAqBvE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAChC,YACkB,mBAAwC,EACxC,iBAAoC,EACpC,OAAgB,EAChB,OAAgB,EAChB,aAA4B,EAC5B,gBAAkC,EAClC,cAA8B;QAN9B,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,YAAO,GAAP,OAAO,CAAS;QAChB,YAAO,GAAP,OAAO,CAAS;QAChB,kBAAa,GAAb,aAAa,CAAe;QAC5B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,mBAAc,GAAd,cAAc,CAAgB;IAC7C,CAAC;IAOJ,KAAK,CAAC,MAAM,CAAC,OAA+B;QAC3C,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;QACzD,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,YAAY,CAAC;QAChE,MAAM,gBAAgB,GAAqB,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;QACtF,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC;QAC5C,MAAM,eAAe,GAAG,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,EAAE,QAAQ,EAAE,CAAC;QACrE,MAAM,IAAI,GAAG,IAAA,mBAAS,EAAC,OAAO,CAAC,CAAC;QAChC,MAAM,iBAAiB,GAAG,YAAY,CAAC,SAAS,IAAI,IAAI,CAAC;QAEzD,IAAI,CAAC;YACJ,OAAO,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;gBACtE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,oBAAe,EAAE,eAAe,CAAC,CAAC;gBAC1E,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC9C,MAAM,GAAG,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC;gBAC5C,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,CAAC;gBAE3E,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;gBAExD,OAAO,WAAW,CAAC;YACpB,CAAC,CAAC,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,eAAe,CAAC,gBAAgB,IAAI,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC/E,MAAM,IAAI,mDAAuB,CAAC,eAAe,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;YAC5E,CAAC;YACD,MAAM,KAAK,CAAC;QACb,CAAC;IACF,CAAC;IAOD,KAAK,CAAC,uBAAuB,CAC5B,WAAmB,EACnB,SAAsC,EACtC,UAAsC;QAEtC,MAAM,YAAY,GAAG,SAAS,CAAC,IAAI,KAAK,SAAS,IAAI,SAAS,CAAC,YAAY,KAAK,SAAS,CAAC;QAE1F,IAAI,CAAC,YAAY,EAAE,CAAC;YACnB,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QACxE,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC;YACrD,KAAK,EAAE,IAAI,CAAC,yBAAyB,CAAC,WAAW,EAAE,UAAU,CAAC;YAC9D,MAAM,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,CAAC;SACxC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QAE1B,MAAM,GAAG,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,WAAW,EAAE,CAAC;QAC3D,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAEhD,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;IACtE,CAAC;IAUD,KAAK,CAAC,uBAAuB,CAAC,MAAsB;QACnD,IAAI,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC;YACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,yBAAyB,GAAG,gBAAI,CAAC,KAAK,CAAC,cAAc,CAAC;YAC7F,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,CAAC;YAClD,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QAC1E,CAAC;aAAM,CAAC;YACP,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC/B,CAAC;IACF,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAyC;QACzD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAEjC,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC;QAE7D,MAAM,OAAO,CAAC,GAAG,CAAC;YACjB,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;YACvE,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,WAAoB,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;YAC7F,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE;SACzE,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,QAAmC;QACrD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,wBAAwB,CAAC,QAAQ,CAAC,CAAC;QAE/E,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC;QACvD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;YAAE,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC1D,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC7B,WAAmB,EACnB,SAAsC,EACtC,UAAsC;QAEtC,MAAM,gBAAgB,GAAG,IAAI,CAAC,0BAA0B,CAAC,SAAS,CAAC,CAAC;QACpE,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAE5D,MAAM,cAAc,GAAG,IAAI,CAAC,yBAAyB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAC/E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;QACvF,OAAO,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAEO,KAAK,CAAC,eAAe,CAC5B,GAAiB,EACjB,KAAyB,EACzB,SAAsC,EACtC,UAAsC;QAEtC,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,SAAS,CAAC;QACzC,MAAM,gBAAgB,GAAG,IAAI,CAAC,0BAA0B,CAAC,SAAS,CAAC,CAAC;QAEpE,OAAO,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;YACtE,MAAM,cAAc,GAAG,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;YAEnF,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC9C,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,oBAAe,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC;gBAClF,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC,KAAK,CAAC;oBAAE,OAAO,KAAK,CAAC;YAChD,CAAC;iBAAM,IAAI,UAAU,EAAE,CAAC;gBAQvB,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,oBAAe,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;gBAChF,IAAI,YAAY,KAAK,CAAC;oBAAE,OAAO,KAAK,CAAC;YACtC,CAAC;YAMD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC3C,IAAI,CAAC,QAAQ;gBAAE,MAAM,IAAI,wDAAyB,CAAC,GAAG,CAAC,CAAC;YAExD,MAAM,KAAK,CAAC,KAAK,CAChB,GAAG,EACH;gBACC,IAAI,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI;gBAC1D,YAAY,EAAE,YAAY;oBACzB,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC;oBACvC,CAAC,CAAC,QAAQ,CAAC,YAAY;gBACxB,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB;aAC7C,EACD,EAAE,CACF,CAAC;YAEF,OAAO,IAAI,CAAC;QACb,CAAC,CAAC,CAAC;IACJ,CAAC;IAeO,0BAA0B,CACjC,SAAsC;QAEtC,MAAM,EACL,EAAE,EAAE,GAAG,EACP,IAAI,EAAE,KAAK,EACX,UAAU,EAAE,WAAW,EACvB,YAAY,EAAE,aAAa,EAC3B,iBAAiB,EAAE,kBAAkB,EACrC,SAAS,EAAE,UAAU,EACrB,SAAS,EAAE,UAAU,EACrB,UAAU,EAAE,WAAW,EACvB,GAAG,gBAAgB,EACnB,GAAG,SAAS,CAAC;QACd,OAAO,gBAAgB,CAAC;IACzB,CAAC;IAEO,yBAAyB,CAChC,WAAmB,EACnB,UAAsC;QAEtC,IAAI,UAAU,EAAE,aAAa,IAAI,UAAU,EAAE,kBAAkB,EAAE,CAAC;YACjE,MAAM,IAAI,8BAAe,CAAC,6DAA6D,CAAC,CAAC;QAC1F,CAAC;QAED,MAAM,KAAK,GAAsC,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC;QACrE,IAAI,UAAU,EAAE,aAAa;YAAE,KAAK,CAAC,MAAM,GAAG,UAAU,CAAC,aAAa,CAAC;QAIvE,IAAI,UAAU,EAAE,kBAAkB;YAAE,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC;QAC3D,IAAI,UAAU,EAAE,kBAAkB;YAAE,KAAK,CAAC,MAAM,GAAG,IAAA,QAAG,EAAC,UAAU,CAAC,CAAC;QACnE,OAAO,KAAK,CAAC;IACd,CAAC;IAEO,WAAW,CAAC,QAAsC;QACzD,QAAQ,QAAQ,EAAE,CAAC;YAClB,KAAK,IAAI;gBACR,OAAO,IAAI,CAAC,OAAO,CAAC;YACrB,KAAK,IAAI;gBACR,OAAO,IAAI,CAAC,OAAO,CAAC;QACtB,CAAC;QACD,MAAM,WAAW,GAAU,QAAQ,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,6BAA6B,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IACrE,CAAC;IAEO,kBAAkB,CACzB,YAA6D;QAE7D,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC;QAChE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC;IACnD,CAAC;IAQO,yBAAyB,CAAC,KAAc;QAC/C,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,IAAI,CAAC,CAAC,aAAa,IAAI,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QACzE,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;QAC9B,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,WAAW,KAAK,IAAI,IAAI,CAAC,CAAC,MAAM,IAAI,WAAW,CAAC,EAAE,CAAC;YACzF,OAAO,KAAK,CAAC;QACd,CAAC;QACD,MAAM,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;QAC7B,IAAI,OAAO,IAAI,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QAC3C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC;YAAE,OAAO,KAAK,CAAC;QAE9D,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;YAC/C,OAAO,IAAI,KAAK,OAAO,CAAC;QACzB,CAAC;QAGD,OAAO,CACN,IAAI,KAAK,0BAA0B;YACnC,CAAC,IAAI,KAAK,mBAAmB,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAC,CAAC,CACpF,CAAC;IACH,CAAC;CACD,CAAA;AA1QY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,YAAO,GAAE;qCAG8B,wBAAmB;QACrB,4BAAiB;QAC3B,kBAAO;QACP,kBAAO;QACD,wBAAa;QACV,yBAAgB;QAClB,uBAAc;GARpC,oBAAoB,CA0QhC"}
1	+ {"version":3,"file":"execution-persistence.js","sourceRoot":"","sources":["../../src/executions/execution-persistence.ts"],"names":[],"mappings":"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"}

package/dist/modules/agents/integrations/agent-chat-bridge.js CHANGED Viewed

@@ -167,7 +167,7 @@ class AgentChatBridge {
             message: text,
             memory: {
                 threadId,
-                resourceId: (0, agent_memory_scope_1.integrationMemoryResourceId)(this.integration.type, platformThreadId),
+                resourceId: (0, agent_memory_scope_1.integrationMemoryResourceId)(this.integration.type, message.author.userId),
             },
             integrationType: this.integration.type,
         });