@kumori/aurora-backend-handler 1.0.81 → 1.0.83

package/package.json

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

package/websocket-manager.ts

@@ -683,9 +683,13 @@ const handleEvent = async (message: WSMessage) => {
         if (revisionResult.roles.length > 0) {
           roleMap.set(revisionResult.serviceId, revisionResult.roles);
         }
+
+        let resolvedRevisionService: Service | null = null;
         if (revisionResult.updatedService) {
-          const resolved = resolveServiceStatus(revisionResult.updatedService);
-          servicesMap.set(revisionResult.serviceId, resolved);
+          resolvedRevisionService = resolveServiceStatus(
+            revisionResult.updatedService,
+          );
+          servicesMap.set(revisionResult.serviceId, resolvedRevisionService);
         }
         if (revisionResult.updatedEnvironment) {
           const envId = revisionResult.updatedService?.environment;
@@ -701,12 +705,11 @@ const handleEvent = async (message: WSMessage) => {
         }
         if (
           revisionResult.serviceDeploymentErrorEvent &&
+          resolvedRevisionService &&
           String(entityId) ===
             String(revisionResult.updatedService?.currentRevision)
         ) {
-          eventHelper.service.publish.deploymentError(
-            revisionResult.serviceDeploymentErrorEvent,
-          );
+          eventHelper.service.publish.deploymentError(resolvedRevisionService);
         }
         if (
           revisionResult.shouldFetchChannels &&
@@ -1910,12 +1913,15 @@ export const updateUserComplete = (updatedUserData: UserData): User => {
   }
 };
 const resolveServiceStatus = (service: Service): Service => {
-  const revisionKey = `${service.tenant}/${service.name}-${service.currentRevision}`;
-  const currentRevision = revisionsMap.get(revisionKey);
+  if (service.status?.code === "REMOVING_SERVICE") {
+    return service;
+  }
 
   if (service.error) {
     return service;
   }
+  const revisionKey = `${service.tenant}/${service.name}-${service.currentRevision}`;
+  const currentRevision = revisionsMap.get(revisionKey);
 
   if (!currentRevision) {
     return service;