@kumori/aurora-backend-handler 1.1.64 → 1.1.66

package/api/account-api-service.ts

@@ -8,6 +8,13 @@ import { eventHelper } from "../backend-handler";
 
 type Security = string;
 function extractErrorInfo(error: unknown): { code: string; message: string } {
+  if ((error as any)?.isTimeout) {
+    return {
+      code: "timeout",
+      message:
+        "The request is taking too long, but it does not mean it failed. If you need more help, please contact support.",
+    };
+  }
   const err = (error as any)?.error;
   return {
     code: err?.code ?? "unknown_error",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kumori/aurora-backend-handler",
-  "version": "1.1.64",
+  "version": "1.1.66",
   "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,16 +452,23 @@ export const makeGlobalWebSocketRequest = async (
           new Error(`Request timeout for ${topic}`),
         );
       }
-      reject(new Error(`Request timeout for ${topic}`));
+      if (purgeEnvKey) purgingEnvironments.delete(purgeEnvKey);
+      const timeoutError = Object.assign(
+        new Error(`Request timeout for ${topic}`),
+        { isTimeout: true },
+      );
+      reject(timeoutError);
     }, timeout);
 
     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,
@@ -678,7 +694,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({
@@ -1563,7 +1590,6 @@ const handleOperationError = (operation: PendingOperation, error: any) => {
       } else if (accErrorResult.eventType === "deletionError") {
         eventHelper.account.publish.deletionError(originalData);
       }
-      eventHelper.notification.publish.creation(accErrorResult.notification);
       break;
     case "environment":
       const envErrorResult = handleEnvironmentOperationError({