@kumori/aurora-backend-handler 1.0.66 → 1.0.68

package/helpers/revision-helper.ts

@@ -256,33 +256,39 @@ const updateServiceWithRevision = (
   const incomingStatus = eventData.status.state;
   const incomingTs = getTimestamp(incomingStatus.timestamp);
   const currentTs = getTimestamp(existingService.status?.timestamp);
+  const incomingRevisionId = Number(entityId);
+  const currentRevisionId = Number(existingService.currentRevision ?? 0);
 
   if (incomingTs > currentTs) {
     updatedService.status = incomingStatus;
     if (eventData.status.error) {
-      updatedService.error = {
-        code: eventData.status.error.code,
-        message: eventData.status.error.message,
-        timestamp: eventData.status.error.timestamp || incomingStatus.timestamp,
-      };
-      deploymentErrorEvent = updatedService;
+      if (incomingRevisionId >= currentRevisionId) {
+        updatedService.error = {
+          code: eventData.status.error.code,
+          message: eventData.status.error.message,
+          timestamp:
+            eventData.status.error.timestamp || incomingStatus.timestamp,
+        };
+        deploymentErrorEvent = updatedService;
+      }
     } else {
       updatedService.error = undefined;
     }
   } else if (eventData.status.error) {
-    const incomingErrorTs = getTimestamp(eventData.status.error.timestamp);
-    const currentErrorTs = getTimestamp(existingService.error?.timestamp);
-    if (incomingErrorTs > currentErrorTs) {
-      updatedService.error = {
-        code: eventData.status.error.code,
-        message: eventData.status.error.message,
-        timestamp: eventData.status.error.timestamp,
-      };
-      deploymentErrorEvent = updatedService;
+    if (incomingRevisionId >= currentRevisionId) {
+      const incomingErrorTs = getTimestamp(eventData.status.error.timestamp);
+      const currentErrorTs = getTimestamp(existingService.error?.timestamp);
+      if (incomingErrorTs > currentErrorTs) {
+        updatedService.error = {
+          code: eventData.status.error.code,
+          message: eventData.status.error.message,
+          timestamp: eventData.status.error.timestamp,
+        };
+        deploymentErrorEvent = updatedService;
+      }
     }
   }
-  const incomingRevisionId = Number(entityId);
-  const currentRevisionId = Number(existingService.currentRevision ?? 0);
+
   if (incomingRevisionId >= currentRevisionId && !eventData.status.error) {
     updatedService.error = undefined;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kumori/aurora-backend-handler",
-  "version": "1.0.66",
+  "version": "1.0.68",
   "description": "backend handler",
   "main": "backend-handler.ts",
   "scripts": {

package/websocket-manager.ts

@@ -75,6 +75,7 @@ import {
 import { handleLinkEvent } from "./helpers/link-helper";
 import { eventHelper } from "./backend-handler";
 import { Revision } from "@kumori/aurora-interfaces/interfaces/revision-interface";
+import { requestRevisionData } from "./api/service-api-service";
 
 let WebSocketClass: any;
 
@@ -189,6 +190,7 @@ let isLoadingReporting = false;
 const REPORTING_ITERATIONS = 5;
 const REPORTING_INTERVAL = 1000;
 let hasLoadedReportingOnce = false;
+let recentlyUpdatedServices = new Map<string, Service>();
 
 /**
  * Helper function to safely stringify error objects
@@ -723,6 +725,17 @@ const handleEvent = async (message: WSMessage) => {
               });
             });
         }
+        const revisionState = eventData.status?.state?.code;
+        if (revisionState === "DEPLOYED" && currentToken) {
+          recentlyUpdatedServices.forEach((service, serviceKey) => {
+            requestRevisionData(service, currentToken!).catch((err) => {
+              console.error(
+                `[ws] Error fetching revision data after DEPLOYED for ${serviceKey}:`,
+                err,
+              );
+            });
+          });
+        }
         break;
       case "service":
         const serviceResult = handleServiceEvent({
@@ -751,6 +764,7 @@ const handleEvent = async (message: WSMessage) => {
             servicesMap.set(serviceResult.serviceFullKey, savedService);
           }
         }
+
         const projectLabel = eventData.meta?.labels?.project;
         if (projectLabel) {
           const tenant = tenantsMap.get(parentParts.tenant);
@@ -1246,6 +1260,7 @@ const handleOperationSuccess = (operation: PendingOperation, response: any) => {
             }
 
             servicesMap.set(svcSuccessResult.serviceId, updatedService);
+            recentlyUpdatedServices.delete(svcSuccessResult.serviceId);
 
             if (updatedService.role && updatedService.role.length > 0) {
               roleMap.set(svcSuccessResult.serviceId, updatedService.role);
@@ -1284,6 +1299,10 @@ const handleOperationSuccess = (operation: PendingOperation, response: any) => {
           eventHelper.service.publish.deployed(svcSuccessResult.updatedService);
         } else if (svcSuccessResult.eventType === "updated") {
           eventHelper.service.publish.updated(svcSuccessResult.updatedService);
+          recentlyUpdatedServices.set(
+            svcSuccessResult.serviceId,
+            svcSuccessResult.updatedService,
+          );
         } else if (svcSuccessResult.eventType === "deleting") {
           eventHelper.service.publish.updated(svcSuccessResult.updatedService);
         }