@kumori/aurora-backend-handler 1.1.49 → 1.1.51

package/helpers/revision-helper.ts

@@ -179,19 +179,20 @@ const getContainerError = (
 };
 
 const handleRevisionStatus = (revisionStatus: any) => {
-  if (revisionStatus?.error) {
-    return {
-      code: revisionStatus.error.code,
-      message: revisionStatus.error.message,
-      timestamp: Date.now().toString(),
-    };
+  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(),
+          };
+        }
+      }
+    }
   }
 
-  const containerError = getContainerError(revisionStatus);
-  if (containerError) return containerError;
-  if (revisionStatus?.runtime?.status) {
-    return revisionStatus.runtime.status;
-  }
   return revisionStatus?.state;
 };
 
@@ -201,9 +202,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,
@@ -239,9 +238,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,59 +123,40 @@ const determineFinalStatusAndError = (
   eventData: any,
   pendingRevisionErrors: Array<{ service: string; revision: Revision }>,
   entityId: string,
-  currentRevision: Revision | undefined,
 ): {
   finalStatus: any;
   finalError: any;
   pendingErrorIndex: number;
 } => {
-  const incomingServiceStatus = eventData.status.state;
-  const incomingTs = getTimestamp(incomingServiceStatus.timestamp);
+  const incomingStatus = eventData.status.state;
+  const incomingTs = getTimestamp(incomingStatus.timestamp);
   const currentTs = getTimestamp(existingService?.status?.timestamp);
+
   const isNewer = !existingService || incomingTs > currentTs;
+  let finalStatus = existingService?.status;
+  let finalError = existingService?.error;
+
+  if (isNewer) {
+    finalStatus = incomingStatus;
+    finalError = eventData.status.error ?? undefined;
+  }
 
   const pendingErrorIndex = pendingRevisionErrors.findIndex(
     (pending) => pending.service === entityId,
   );
-  const pendingError =
-    pendingErrorIndex !== -1 ? pendingRevisionErrors[pendingErrorIndex] : null;
-  const serviceError = isNewer ? eventData.status.error : undefined;
-  const revisionError =
-    currentRevision?.errorCode
-      ? {
-          code: currentRevision.errorCode,
-          message: currentRevision.errorMsg || "",
-          timestamp: currentRevision.status?.timestamp || "",
-        }
-      : null;
-
-  if (serviceError) {
-    return { finalStatus: incomingServiceStatus, finalError: serviceError, pendingErrorIndex };
-  }
 
-  if (revisionError) {
-    return { finalStatus: currentRevision!.status, finalError: revisionError, pendingErrorIndex };
-  }
-
-  if (pendingError) {
-    return {
-      finalStatus: pendingError.revision.status,
-      finalError: {
-        code: pendingError.revision.errorCode || "",
-        message: pendingError.revision.errorMsg || "",
-        timestamp: pendingError.revision.status?.timestamp || "",
-      },
-      pendingErrorIndex,
+  if (pendingErrorIndex !== -1) {
+    const pendingError = pendingRevisionErrors[pendingErrorIndex];
+  
+    finalStatus = pendingError.revision.status;
+    finalError = {
+      code: pendingError.revision.errorCode || "",
+      message: pendingError.revision.errorMsg || "",
+      timestamp: pendingError.revision.status.timestamp || "",
     };
   }
-  if (currentRevision?.status && isNewer) {
-    return { finalStatus: currentRevision.status, finalError: undefined, pendingErrorIndex };
-  }
-  if (isNewer) {
-    return { finalStatus: incomingServiceStatus, finalError: undefined, pendingErrorIndex };
-  }
 
-  return { finalStatus: existingService?.status, finalError: existingService?.error, pendingErrorIndex };
+  return { finalStatus, finalError, pendingErrorIndex };
 };
 
 export const handleServiceEvent = ({
@@ -214,7 +195,6 @@ 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.49",
+  "version": "1.1.51",
   "description": "backend handler",
   "main": "backend-handler.ts",
   "scripts": {