@kumori/aurora-backend-handler 1.1.50 → 1.1.52

package/helpers/revision-helper.ts

@@ -179,16 +179,23 @@ const getContainerError = (
 };
 
 const handleRevisionStatus = (revisionStatus: any) => {
-  if (revisionStatus?.error) {
-    return {
-      code: revisionStatus.error.code,
-      message: revisionStatus.error.message,
-      timestamp: Date.now().toString(),
-    };
+  if (!revisionStatus?.runtime) {
+    return revisionStatus?.state;
   }
 
-  const containerError = getContainerError(revisionStatus);
-  if (containerError) return containerError;
+  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;
 };
@@ -199,9 +206,7 @@ const createRevision = (
   usedCpu: number,
   usedMemory: number,
 ): Revision => {
-  const status = handleRevisionStatus(eventData.status);
-  const explicitError = eventData.status?.error;
-  const containerError = !explicitError ? getContainerError(eventData.status) : null;
+  const containerError = eventData.status?.error ? null : getContainerError(eventData.status);
 
   return {
     id: entityId,
@@ -237,9 +242,9 @@ const createRevision = (
       },
       cost: 0,
     },
-    status,
-    errorCode: explicitError ? explicitError.code : containerError ? containerError.code : "",
-    errorMsg: explicitError ? explicitError.message : containerError ? containerError.message : "",
+    status: handleRevisionStatus(eventData.status),
+    errorCode: eventData.status?.error ? eventData.status.error.code : containerError?.code ?? "",
+    errorMsg: eventData.status?.error ? eventData.status.error.message : containerError?.message ?? "",
     createdAt:
       (eventData.status && eventData.status.runtime?.status?.createdAt) || "",
   };

package/helpers/service-helper.ts

@@ -123,6 +123,7 @@ const determineFinalStatusAndError = (
   eventData: any,
   pendingRevisionErrors: Array<{ service: string; revision: Revision }>,
   entityId: string,
+  currentRevision: Revision | undefined,
 ): {
   finalStatus: any;
   finalError: any;
@@ -131,23 +132,27 @@ const determineFinalStatusAndError = (
   const incomingStatus = eventData.status.state;
   const incomingTs = getTimestamp(incomingStatus.timestamp);
   const currentTs = getTimestamp(existingService?.status?.timestamp);
+  const revisionTs = currentRevision?.status ? getTimestamp(currentRevision.status.timestamp) : 0;
+
+  const bestCandidateTs = Math.max(incomingTs, revisionTs);
+  const isNewer = !existingService || bestCandidateTs > currentTs;
 
-  const isNewer = !existingService || incomingTs > currentTs;
   let finalStatus = existingService?.status;
   let finalError = existingService?.error;
 
   if (isNewer) {
-    finalStatus = incomingStatus;
+    const revisionHasError = !!currentRevision?.errorCode;
+    finalStatus = (revisionHasError || (currentRevision?.status && revisionTs >= incomingTs))
+      ? currentRevision!.status
+      : incomingStatus;
     finalError = eventData.status.error ?? undefined;
   }
 
   const pendingErrorIndex = pendingRevisionErrors.findIndex(
     (pending) => pending.service === entityId,
   );
-
   if (pendingErrorIndex !== -1) {
     const pendingError = pendingRevisionErrors[pendingErrorIndex];
-  
     finalStatus = pendingError.revision.status;
     finalError = {
       code: pendingError.revision.errorCode || "",
@@ -195,6 +200,7 @@ export const handleServiceEvent = ({
       eventData,
       pendingRevisionErrors,
       entityId,
+      currentRevision,
     );
 
   const updatedPendingRevisionErrors = [...pendingRevisionErrors];

package/package.json

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