@kumori/aurora-backend-handler 1.1.51 → 1.1.53

package/helpers/revision-helper.ts

@@ -179,6 +179,10 @@ const getContainerError = (
 };
 
 const handleRevisionStatus = (revisionStatus: any) => {
+  if (!revisionStatus?.runtime) {
+    return revisionStatus?.state;
+  }
+
   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 ?? {})) {

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,31 @@ 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 (existingService?.status?.code === "REMOVING_SERVICE") {
+    return { finalStatus, finalError, pendingErrorIndex: -1 };
+  }
+
   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 +204,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.51",
+  "version": "1.1.53",
   "description": "backend handler",
   "main": "backend-handler.ts",
   "scripts": {