@atom8n/n8n 2.5.2 → 2.5.4

package/dist/controllers/cli.controller.js

@@ -58,6 +58,7 @@ let CliController = CliController_1 = class CliController {
         const fileData = body.workflowData;
         const chatInput = body.chatInput;
         const inputData = body.inputData;
+        const fileModifiedAt = body.fileModifiedAt;
         this.logger.info(`[cli] inputData: ${inputData ? JSON.stringify(inputData) : '(none)'}`);
         if (!fileData.nodes || !Array.isArray(fileData.nodes)) {
             res.status(400).json({ error: 'Workflow does not contain valid nodes' });
@@ -70,13 +71,13 @@ let CliController = CliController_1 = class CliController {
         this.logger.info(`[cli] Workflow: "${fileData.name}", Nodes: ${fileData.nodes.length}`);
         try {
             const user = await this.ownershipService.getInstanceOwner();
-            const workflowId = await this.syncWorkflow(fileData, user.id);
-            const workflow = await this.workflowRepository.findOneBy({ id: workflowId });
+            const syncResult = await this.syncWorkflow(fileData, user.id, fileModifiedAt);
+            const workflow = await this.workflowRepository.findOneBy({ id: syncResult.id });
             if (!workflow) {
                 res.status(500).json({ error: 'Failed to sync workflow to database' });
                 return;
             }
-            this.logger.info(`[cli] Synced workflow: "${workflow.name}" (ID: ${workflowId})`);
+            this.logger.info(`[cli] Synced workflow: "${workflow.name}" (ID: ${syncResult.id})`);
             const triggerNode = workflow.nodes.find((node) => node.type.toLowerCase().includes('trigger') ||
                 node.type.toLowerCase().includes('webhook') ||
                 node.type === 'n8n-nodes-base.start');
@@ -204,13 +205,17 @@ let CliController = CliController_1 = class CliController {
                     includeData: true,
                     unflattenData: true,
                 });
-                res.json({
+                const responsePayload = {
                     success: isSuccess,
                     executionId,
                     status: runResult.status,
                     executionTime: totalTime,
                     data: fullExecution?.data?.resultData ?? runResult.data.resultData,
-                });
+                };
+                if (syncResult.syncedWorkflow) {
+                    responsePayload.syncedWorkflow = syncResult.syncedWorkflow;
+                }
+                res.json(responsePayload);
             }
             catch (error) {
                 if (timeoutId)
@@ -228,17 +233,19 @@ let CliController = CliController_1 = class CliController {
             });
         }
     }
-    async syncWorkflow(fileData, userId) {
+    async syncWorkflow(fileData, userId, fileModifiedAt) {
         if (fileData.id && (0, utils_1.isWorkflowIdValid)(fileData.id)) {
             const existing = await this.workflowRepository.findOneBy({ id: fileData.id });
             if (existing) {
-                const fileUpdatedAt = fileData.updatedAt
-                    ? new Date(fileData.updatedAt)
-                    : null;
+                const fileUpdatedAt = fileModifiedAt ? new Date(fileModifiedAt) : null;
                 const serverUpdatedAt = existing.updatedAt
                     ? new Date(existing.updatedAt)
                     : null;
-                if (fileUpdatedAt && serverUpdatedAt && fileUpdatedAt > serverUpdatedAt) {
+                this.logger.info(`[cli] Found existing workflow (ID match): ${existing.id}, ` +
+                    `fileUpdatedAt=${fileUpdatedAt?.toISOString() ?? 'null'}, ` +
+                    `serverUpdatedAt=${serverUpdatedAt?.toISOString() ?? 'null'}`);
+                const shouldUpdate = !fileUpdatedAt || !serverUpdatedAt || fileUpdatedAt >= serverUpdatedAt;
+                if (shouldUpdate) {
                     this.logger.info(`[cli] Updating existing workflow (ID match): ${existing.id}`);
                     await this.workflowRepository.update(existing.id, {
                         nodes: fileData.nodes,
@@ -247,23 +254,36 @@ let CliController = CliController_1 = class CliController {
                         name: fileData.name,
                         updatedAt: new Date(),
                     });
+                    return { id: existing.id };
                 }
                 else {
-                    this.logger.info(`[cli] Using existing workflow (ID match): ${existing.id}`);
+                    this.logger.info(`[cli] Using existing workflow (ID match): ${existing.id} ` +
+                        `(server is newer: ${serverUpdatedAt.toISOString()} > ${fileUpdatedAt.toISOString()})`);
+                    return {
+                        id: existing.id,
+                        syncedWorkflow: {
+                            name: existing.name,
+                            nodes: existing.nodes,
+                            connections: existing.connections,
+                            settings: existing.settings,
+                            pinData: existing.pinData ?? {},
+                        },
+                    };
                 }
-                return existing.id;
             }
         }
         if (fileData.name) {
             const existing = await this.workflowRepository.findOneBy({ name: fileData.name });
             if (existing) {
-                const fileUpdatedAt = fileData.updatedAt
-                    ? new Date(fileData.updatedAt)
-                    : null;
+                const fileUpdatedAt = fileModifiedAt ? new Date(fileModifiedAt) : null;
                 const serverUpdatedAt = existing.updatedAt
                     ? new Date(existing.updatedAt)
                     : null;
-                if (fileUpdatedAt && serverUpdatedAt && fileUpdatedAt > serverUpdatedAt) {
+                this.logger.info(`[cli] Found existing workflow (name match): ${existing.id}, ` +
+                    `fileUpdatedAt=${fileUpdatedAt?.toISOString() ?? 'null'}, ` +
+                    `serverUpdatedAt=${serverUpdatedAt?.toISOString() ?? 'null'}`);
+                const shouldUpdate = !fileUpdatedAt || !serverUpdatedAt || fileUpdatedAt >= serverUpdatedAt;
+                if (shouldUpdate) {
                     this.logger.info(`[cli] Updating existing workflow (name match): ${existing.id}`);
                     await this.workflowRepository.update(existing.id, {
                         nodes: fileData.nodes,
@@ -272,11 +292,22 @@ let CliController = CliController_1 = class CliController {
                         name: fileData.name,
                         updatedAt: new Date(),
                     });
+                    return { id: existing.id };
                 }
                 else {
-                    this.logger.info(`[cli] Using existing workflow (name match): ${existing.id}`);
+                    this.logger.info(`[cli] Using existing workflow (name match): ${existing.id} ` +
+                        `(server is newer: ${serverUpdatedAt.toISOString()} > ${fileUpdatedAt.toISOString()})`);
+                    return {
+                        id: existing.id,
+                        syncedWorkflow: {
+                            name: existing.name,
+                            nodes: existing.nodes,
+                            connections: existing.connections,
+                            settings: existing.settings,
+                            pinData: existing.pinData ?? {},
+                        },
+                    };
                 }
-                return existing.id;
             }
         }
         const workflowId = fileData.id && (0, utils_1.isWorkflowIdValid)(fileData.id) ? fileData.id : (0, db_1.generateNanoId)();
@@ -301,7 +332,7 @@ let CliController = CliController_1 = class CliController {
             });
             await transactionManager.save(sharedWorkflow);
         });
-        return workflowId;
+        return { id: workflowId };
     }
     async health() {
         return { status: 'ok', timestamp: new Date().toISOString() };