@kumori/aurora-backend-handler 1.0.65 → 1.0.67

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.65",
+  "version": "1.0.67",
   "description": "backend handler",
   "main": "backend-handler.ts",
   "scripts": {

package/websocket-manager.ts

@@ -744,14 +744,14 @@ const handleEvent = async (message: WSMessage) => {
 
         const savedService = servicesMap.get(serviceResult.serviceFullKey)!;
         if (savedService.error && savedService.currentRevision) {
-          const currentRev = savedService.revisions.find(
-            (rev) => String(rev.id) === String(savedService.currentRevision),
-          );
-          if (currentRev && !currentRev.errorCode) {
+          const currentRevId = Number(savedService.currentRevision);
+          const errorTs = Number(savedService.error.timestamp ?? 0);
+          if (currentRevId > errorTs) {
             savedService.error = undefined;
             servicesMap.set(serviceResult.serviceFullKey, savedService);
           }
         }
+
         const projectLabel = eventData.meta?.labels?.project;
         if (projectLabel) {
           const tenant = tenantsMap.get(parentParts.tenant);