@kumori/aurora-backend-handler 1.0.83 → 1.0.85

package/helpers/service-helper.ts

@@ -210,30 +210,24 @@ export const handleServiceEvent = ({
     updatedPendingRevisionErrors.splice(pendingErrorIndex, 1);
   }
 
-  const currentRevisionId =
-    eventData.status.revision ||
-    (serviceRevisions.length > 0
-      ? Math.max(...serviceRevisions.map((r) => Number(r.id))).toString()
-      : "");
-
   const baseServiceData = {
-    tenant: serviceTenantId,
-    account: eventData.spec.metadata.targetAccount || pathParts.account,
-    environment:
-      eventData.spec.metadata.targetEnvironment || pathParts.environment,
-    name: entityId,
-    revisions: [...serviceRevisions].sort(
-      (a, b) => Number(b.id) - Number(a.id),
-    ),
-    status: finalStatus || eventData.status.state,
-    error: finalError,
-    role: serviceRoles.length > 0 ? serviceRoles : existingService?.role || [],
-    usage: serviceUsage,
-    lastDeployed: eventData.spec.ctstamp,
-    project: projectLabel || existingService?.project || "",
-    currentRevision: currentRevisionId,
-    startedAt: currentRevision?.createdAt || existingService?.startedAt || "",
-  };
+  tenant: serviceTenantId,
+  account: eventData.spec.metadata.targetAccount || pathParts.account,
+  environment:
+    eventData.spec.metadata.targetEnvironment || pathParts.environment,
+  name: entityId,
+  revisions: [...serviceRevisions].sort(
+    (a, b) => Number(b.id) - Number(a.id),
+  ),
+  status: finalStatus || eventData.status.state,
+  error: finalError,
+  role: serviceRoles.length > 0 ? serviceRoles : existingService?.role || [],
+  usage: serviceUsage,
+  lastDeployed: eventData.spec.ctstamp,
+  project: projectLabel || existingService?.project || "",
+  currentRevision: String(eventData.spec.ctstamp || eventData.status.revision || ""),
+  startedAt: currentRevision?.createdAt || existingService?.startedAt || "",
+};
 
   let newService: Service;
 

package/package.json

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

package/websocket-manager.ts

@@ -706,6 +706,8 @@ const handleEvent = async (message: WSMessage) => {
         if (
           revisionResult.serviceDeploymentErrorEvent &&
           resolvedRevisionService &&
+          resolvedRevisionService.error &&
+          resolvedRevisionService.status?.code !== "REMOVING_SERVICE" &&
           String(entityId) ===
             String(revisionResult.updatedService?.currentRevision)
         ) {
@@ -1917,13 +1919,13 @@ const resolveServiceStatus = (service: Service): Service => {
     return service;
   }
 
-  if (service.error) {
-    return service;
-  }
   const revisionKey = `${service.tenant}/${service.name}-${service.currentRevision}`;
   const currentRevision = revisionsMap.get(revisionKey);
 
   if (!currentRevision) {
+    if (service.error) {
+      return service;
+    }
     return service;
   }