@kumori/aurora-backend-handler 1.1.48 → 1.1.50

package/helpers/revision-helper.ts

@@ -159,12 +159,50 @@ const processRolesAndInstances = (
   return { roles, instances, usedCpu, usedMemory };
 };
 
+const getContainerError = (
+  revisionStatus: any,
+): { code: string; message: string; timestamp: string } | null => {
+  for (const roleData of Object.values<any>(revisionStatus?.runtime?.roles ?? {})) {
+    for (const instanceData of Object.values<any>(roleData.instances ?? {})) {
+      for (const container of Object.values<any>(instanceData.containers ?? {})) {
+        if (!container.status.ready) {
+          return {
+            code: container.status.status.waiting?.reason ?? "ContainerNotReady",
+            message: container.status.status.waiting?.message ?? "One or more containers are not ready for unknown reasons.",
+            timestamp: Date.now().toString(),
+          };
+        }
+      }
+    }
+  }
+  return null;
+};
+
+const handleRevisionStatus = (revisionStatus: any) => {
+  if (revisionStatus?.error) {
+    return {
+      code: revisionStatus.error.code,
+      message: revisionStatus.error.message,
+      timestamp: Date.now().toString(),
+    };
+  }
+
+  const containerError = getContainerError(revisionStatus);
+  if (containerError) return containerError;
+
+  return revisionStatus?.state;
+};
+
 const createRevision = (
   entityId: string,
   eventData: any,
   usedCpu: number,
   usedMemory: number,
 ): Revision => {
+  const status = handleRevisionStatus(eventData.status);
+  const explicitError = eventData.status?.error;
+  const containerError = !explicitError ? getContainerError(eventData.status) : null;
+
   return {
     id: entityId,
     schema: {},
@@ -199,30 +237,13 @@ const createRevision = (
       },
       cost: 0,
     },
-    status: handleRevisionStatus(eventData.status),
-    errorCode: eventData.status?.error ? eventData.status.error.code : handleRevisionStatus(eventData.status)?.code === "CrashLoopBackOff" ? handleRevisionStatus(eventData.status)?.code : "",
-    errorMsg: eventData.status?.error ? eventData.status.error.message : handleRevisionStatus(eventData.status)?.code === "CrashLoopBackOff" ? handleRevisionStatus(eventData.status)?.message : "",
+    status,
+    errorCode: explicitError ? explicitError.code : containerError ? containerError.code : "",
+    errorMsg: explicitError ? explicitError.message : containerError ? containerError.message : "",
     createdAt:
       (eventData.status && eventData.status.runtime?.status?.createdAt) || "",
   };
 };
-const handleRevisionStatus = (revisionStatus: any) => {
-  for (const roleData of Object.values<any>(revisionStatus.runtime.roles)) {
-    for (const instanceData of Object.values<any>(roleData.instances)) {
-      for (const container of Object.values<any>(instanceData.containers ?? {})) {
-        if (!container.status.ready) {
-          return {
-            code: container.status.status.waiting?.reason ?? "ContainerNotReady",
-            message: container.status.status.waiting?.message ?? "One or more containers are not ready for unknown reasons.",
-            timestamp: Date.now().toString(),
-          };
-        }
-      }
-    }
-  }
-
-  return revisionStatus?.state;
-};
 const updateServiceWithRevision = (
   existingService: Service,
   entityId: string,

package/helpers/service-helper.ts

@@ -138,11 +138,7 @@ const determineFinalStatusAndError = (
 
   if (isNewer) {
     finalStatus = incomingStatus;
-    if (eventData.status.error) {
-      finalError = eventData.status.error;
-    } else {
-      finalError = undefined;
-    }
+    finalError = eventData.status.error ?? undefined;
   }
 
   const pendingErrorIndex = pendingRevisionErrors.findIndex(
@@ -151,17 +147,13 @@ const determineFinalStatusAndError = (
 
   if (pendingErrorIndex !== -1) {
     const pendingError = pendingRevisionErrors[pendingErrorIndex];
-    const pendingTs = getTimestamp(pendingError.revision.status.timestamp);
-    const currentDecisionTs = getTimestamp(finalStatus?.timestamp);
-
-    if (pendingTs > currentDecisionTs) {
-      finalStatus = pendingError.revision.status;
-      finalError = {
-        code: pendingError.revision.errorCode || "",
-        message: pendingError.revision.errorMsg || "",
-        timestamp: pendingError.revision.status.timestamp || "",
-      };
-    }
+  
+    finalStatus = pendingError.revision.status;
+    finalError = {
+      code: pendingError.revision.errorCode || "",
+      message: pendingError.revision.errorMsg || "",
+      timestamp: pendingError.revision.status.timestamp || "",
+    };
   }
 
   return { finalStatus, finalError, pendingErrorIndex };

package/package.json

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