@kumori/aurora-backend-handler 1.0.79 → 1.0.81

package/helpers/revision-helper.ts

@@ -242,56 +242,12 @@ const updateServiceWithRevision = (
   const updatedService: Service = {
     ...existingService,
     revisions: updatedRevisions,
-    currentRevision:
-      Number(entityId) >= Number(existingService.currentRevision ?? 0)
-        ? entityId
-        : existingService.currentRevision,
     role: roles.length > 0 ? roles : existingService.role,
     usage: newRevision.usage,
     startedAt: newRevision.createdAt || existingService.startedAt,
   };
 
-  let deploymentErrorEvent: Service | null = null;
-
-  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) {
-      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) {
-    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;
-      }
-    }
-  }
-
-  if (incomingRevisionId >= currentRevisionId && !eventData.status.error) {
-    updatedService.error = undefined;
-  }
+  const deploymentErrorEvent = eventData.status?.error ? updatedService : null;
 
   return { updatedService, deploymentErrorEvent };
 };

package/package.json

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

package/websocket-manager.ts

@@ -684,27 +684,26 @@ const handleEvent = async (message: WSMessage) => {
           roleMap.set(revisionResult.serviceId, revisionResult.roles);
         }
         if (revisionResult.updatedService) {
-          servicesMap.set(
-            revisionResult.serviceId,
-            revisionResult.updatedService,
-          );
+          const resolved = resolveServiceStatus(revisionResult.updatedService);
+          servicesMap.set(revisionResult.serviceId, resolved);
         }
         if (revisionResult.updatedEnvironment) {
           const envId = revisionResult.updatedService?.environment;
-          if (envId) {
+          if (envId)
             environmentsMap.set(envId, revisionResult.updatedEnvironment);
-          }
         }
         if (revisionResult.updatedAccount) {
           const accId = revisionResult.updatedService?.account;
-          if (accId) {
-            accountsMap.set(accId, revisionResult.updatedAccount);
-          }
+          if (accId) accountsMap.set(accId, revisionResult.updatedAccount);
         }
         if (revisionResult.pendingRevisionError) {
           pendingRevisionErrors.push(revisionResult.pendingRevisionError);
         }
-        if (revisionResult.serviceDeploymentErrorEvent) {
+        if (
+          revisionResult.serviceDeploymentErrorEvent &&
+          String(entityId) ===
+            String(revisionResult.updatedService?.currentRevision)
+        ) {
           eventHelper.service.publish.deploymentError(
             revisionResult.serviceDeploymentErrorEvent,
           );
@@ -716,14 +715,12 @@ const handleEvent = async (message: WSMessage) => {
           getChannelsInfo(
             revisionResult.channelsFetchInfo.serviceId,
             revisionResult.channelsFetchInfo.tenantId,
-          )
-            .then((channelsInfo) => {})
-            .catch((error) => {
-              console.error("[ws] Error fetching channels info for revision", {
-                revisionServiceId: revisionResult.channelsFetchInfo?.serviceId,
-                error,
-              });
-            });
+          ).catch((error) => {
+            console.error(
+              "[ws] Error fetching channels info for revision",
+              error,
+            );
+          });
         }
         break;
       case "service":
@@ -742,25 +739,15 @@ const handleEvent = async (message: WSMessage) => {
         pendingRevisionErrors.push(
           ...serviceResult.updatedPendingRevisionErrors,
         );
-        servicesMap.set(serviceResult.serviceFullKey, serviceResult.service);
-
-        const savedService = servicesMap.get(serviceResult.serviceFullKey)!;
-        if (savedService.error && savedService.currentRevision) {
-          const currentRevId = Number(savedService.currentRevision);
-          const errorTs = Number(savedService.error.timestamp ?? 0);
-          if (currentRevId > errorTs) {
-            savedService.error = undefined;
-            servicesMap.set(serviceResult.serviceFullKey, savedService);
-          }
-        }
+
+        const resolvedService = resolveServiceStatus(serviceResult.service);
+        servicesMap.set(serviceResult.serviceFullKey, resolvedService);
 
         const projectLabel = eventData.meta?.labels?.project;
         if (projectLabel) {
           const tenant = tenantsMap.get(parentParts.tenant);
           if (tenant) {
-            if (!tenant.projects) {
-              tenant.projects = [];
-            }
+            if (!tenant.projects) tenant.projects = [];
             if (!tenant.projects.includes(projectLabel)) {
               tenant.projects.push(projectLabel);
               tenantsMap.set(parentParts.tenant, tenant);
@@ -770,7 +757,7 @@ const handleEvent = async (message: WSMessage) => {
           }
         }
         if (serviceResult.wasDeployed) {
-          eventHelper.service.publish.deployed(serviceResult.service);
+          eventHelper.service.publish.deployed(resolvedService);
         }
         const serviceState = eventData.status?.state?.code;
         if (serviceState === "SERVICE_READY") {
@@ -1158,7 +1145,7 @@ export const getReferenceDomain = () => {
 };
 const handleOperationSuccess = (operation: PendingOperation, response: any) => {
   const { action, entityType, entityName, originalData } = operation;
-   if (action === "UPDATE_CONFIG") {
+  if (action === "UPDATE_CONFIG") {
     const tenant = originalData?.payload?.tenant;
     const serviceName = originalData?.payload?.service;
     if (tenant && serviceName) {
@@ -1316,7 +1303,7 @@ const handleOperationSuccess = (operation: PendingOperation, response: any) => {
           eventHelper.service.publish.updated(svcSuccessResult.updatedService);
         }
       }
-      break;;
+      break;
     case "account":
       const accSuccessResult = handleAccountOperationSuccess({
         action,
@@ -1922,3 +1909,33 @@ export const updateUserComplete = (updatedUserData: UserData): User => {
     return user;
   }
 };
+const resolveServiceStatus = (service: Service): Service => {
+  const revisionKey = `${service.tenant}/${service.name}-${service.currentRevision}`;
+  const currentRevision = revisionsMap.get(revisionKey);
+
+  if (service.error) {
+    return service;
+  }
+
+  if (!currentRevision) {
+    return service;
+  }
+
+  if (currentRevision.errorCode) {
+    return {
+      ...service,
+      status: currentRevision.status,
+      error: {
+        code: currentRevision.errorCode,
+        message: currentRevision.errorMsg || "",
+        timestamp: currentRevision.status?.timestamp,
+      },
+    };
+  }
+
+  return {
+    ...service,
+    error: undefined,
+    status: currentRevision.status,
+  };
+};