@kumori/aurora-backend-handler 1.1.66 → 1.1.68

package/api/environment-api-service.ts

@@ -5,6 +5,7 @@ import {
   initializeGlobalWebSocketClient,
   getWebSocketStatus,
   makeGlobalWebSocketRequest,
+  markEnvironmentAsPurging,
 } from "../websocket-manager";
 
 type Security = string;
@@ -259,6 +260,10 @@ export const clearEnvironment = async (
       }
     };
     eventHelper.notification.publish.creation(envNotification);
+    const purgeKey = env.tenant && env.account
+      ? `${env.tenant}/${env.account}/${env.name}`
+      : env.name;
+    markEnvironmentAsPurging(purgeKey);
     await initializeGlobalWebSocketClient(security, "environment", env.name);
     const status = getWebSocketStatus();
 

package/helpers/environment-helper.ts

@@ -80,17 +80,18 @@ export const handleEnvironmentEvent = ({
     logo: "",
     services: [],
     domains: [],
-    status: eventData.meta?.deleted
-      ? {
-          code: "DELETING",
-          message: `Environment ${entityId} is being deleted.`,
-          timestamp: new Date().toISOString(),
-        }
-      : {
-          code: eventData.status.state.code,
-          message: eventData.status.state.message,
-          timestamp: eventData.status.state.timestamp,
-        },
+    status: (() => {
+      const existingCode = existingEnvironment?.status?.code;
+      const isPurging = existingCode === "PURGING" || existingCode === "CLEANING_ENVIRONMENT";
+      const eventCode = eventData.meta?.deleted ? "DELETING" : eventData.status?.state?.code;
+      if (isPurging && typeof eventCode === "string" && eventCode.startsWith("DELETING")) {
+        return { code: "PURGING", message: `Environment ${entityId} is being purged.`, timestamp: new Date().toISOString() };
+      }
+      if (eventData.meta?.deleted) {
+        return { code: "DELETING", message: `Environment ${entityId} is being deleted.`, timestamp: new Date().toISOString() };
+      }
+      return { code: eventData.status.state.code, message: eventData.status.state.message, timestamp: eventData.status.state.timestamp };
+    })(),
     highAvaliable: eventData.spec.highlyAvailable || false,
     usage: {
       current: {

package/package.json

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

package/websocket-manager.ts

@@ -545,6 +545,23 @@ export const makeGlobalWebSocketRequestWithRetry = async (
   );
 };
 
+export const markEnvironmentAsPurging = (envKey: string) => {
+  purgingEnvironments.add(envKey);
+  const env = environmentsMap.get(envKey);
+  if (env) {
+    const updatedEnv: Environment = {
+      ...env,
+      status: {
+        code: "PURGING",
+        message: `Environment ${env.name} is being purged.`,
+        timestamp: new Date().toISOString(),
+      },
+    };
+    environmentsMap.set(envKey, updatedEnv);
+    eventHelper.environment.publish.updated(updatedEnv);
+  }
+};
+
 /**
  * Get the current WebSocket connection status
  * @returns Connection status and token info
@@ -695,7 +712,7 @@ const handleEvent = async (message: WSMessage) => {
         }
         const envSetKey = parentParts.tenant && parentParts.account ? `${parentParts.tenant}/${parentParts.account}/${entityId}` : entityId;
         let envToStore = envEventResult.environment;
-        if (envToStore.status?.code === "DELETING" && purgingEnvironments.has(envSetKey)) {
+        if (envToStore.status?.code?.startsWith("DELETING") && purgingEnvironments.has(envSetKey)) {
           envToStore = {
             ...envToStore,
             status: {