@atom8n/n8n 2.5.2 → 2.5.3

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,7 +71,7 @@ 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 workflowId = await this.syncWorkflow(fileData, user.id, fileModifiedAt);
             const workflow = await this.workflowRepository.findOneBy({ id: workflowId });
             if (!workflow) {
                 res.status(500).json({ error: 'Failed to sync workflow to database' });
@@ -228,17 +229,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,
@@ -249,7 +252,8 @@ let CliController = CliController_1 = class CliController {
                     });
                 }
                 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 existing.id;
             }
@@ -257,13 +261,15 @@ let CliController = CliController_1 = class CliController {
         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,
@@ -274,7 +280,8 @@ let CliController = CliController_1 = class CliController {
                     });
                 }
                 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 existing.id;
             }