@kumori/aurora-backend-handler 1.1.65 → 1.1.67

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/package.json

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

package/websocket-manager.ts

@@ -145,6 +145,7 @@ interface Role {
  */
 let wsConnection: WebSocket | null = null;
 let pendingRequests = new Map<string, PendingOperation>();
+let purgingEnvironments = new Set<string>();
 let currentToken: string | null = null;
 let connectionPromise: Promise<WebSocket> | null = null;
 let userData: UserData = {
@@ -428,6 +429,14 @@ export const makeGlobalWebSocketRequest = async (
     payload,
   };
 
+  let purgeEnvKey: string | null = null;
+  if (petitionAction === "CLEAN" && entityType === "environment" && originalData) {
+    purgeEnvKey = originalData.tenant && originalData.account
+      ? `${originalData.tenant}/${originalData.account}/${petitionInfo}`
+      : petitionInfo;
+    purgingEnvironments.add(purgeEnvKey);
+  }
+
   return new Promise((resolve, reject) => {
     const timeoutId = setTimeout(() => {
       const pending = pendingRequests.get(messageId);
@@ -443,6 +452,7 @@ export const makeGlobalWebSocketRequest = async (
           new Error(`Request timeout for ${topic}`),
         );
       }
+      if (purgeEnvKey) purgingEnvironments.delete(purgeEnvKey);
       const timeoutError = Object.assign(
         new Error(`Request timeout for ${topic}`),
         { isTimeout: true },
@@ -453,10 +463,12 @@ export const makeGlobalWebSocketRequest = async (
     const operation: PendingOperation = {
       resolve: (response: any) => {
         clearTimeout(timeoutId);
+        if (purgeEnvKey) purgingEnvironments.delete(purgeEnvKey);
         resolve(response.payload || response);
       },
       reject: (error: any) => {
         clearTimeout(timeoutId);
+        if (purgeEnvKey) purgingEnvironments.delete(purgeEnvKey);
         const errorMessage = safeStringifyError(error);
         console.error(`WebSocket request failed for ${topic}:`, {
           originalError: error,
@@ -533,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
@@ -682,7 +711,18 @@ const handleEvent = async (message: WSMessage) => {
           );
         }
         const envSetKey = parentParts.tenant && parentParts.account ? `${parentParts.tenant}/${parentParts.account}/${entityId}` : entityId;
-        environmentsMap.set(envSetKey, envEventResult.environment);
+        let envToStore = envEventResult.environment;
+        if (envToStore.status?.code === "DELETING" && purgingEnvironments.has(envSetKey)) {
+          envToStore = {
+            ...envToStore,
+            status: {
+              code: "PURGING",
+              message: `Environment ${entityId} is being purged.`,
+              timestamp: new Date().toISOString(),
+            },
+          };
+        }
+        environmentsMap.set(envSetKey, envToStore);
         const envTenant = tenantsMap.get(envEventResult.tenantId);
         if (!envTenant) {
           pendingEnvironments.push({