@kumori/aurora-backend-handler 1.1.84 → 1.1.86

package/api/tenant-api-service.ts

@@ -16,6 +16,35 @@ interface DregistryBody {
     docker_password: string;
   };
 }
+
+/**
+ * Extracts a user-facing code/content pair from a failed request.
+ * Errors coming back from the WS layer are usually nested under `.error`
+ * (e.g. `{ error: { code, content } }`), but some server-side rejections
+ * (e.g. plan/limits validation) return the fields flat on the error object
+ * itself (`{ code, content }`). Without this fallback those errors were
+ * silently reported as "Unknown error" instead of surfacing the real code.
+ */
+const extractWsErrorInfo = (
+  err: unknown
+): { code: string; content: string } => {
+  const candidate =
+    err && typeof err === "object" && "error" in err
+      ? (err as any).error
+      : err;
+
+  const code =
+    candidate && typeof candidate === "object" && typeof candidate.code === "string"
+      ? candidate.code
+      : "Unknown error";
+  const content =
+    candidate && typeof candidate === "object" && typeof candidate.content === "string"
+      ? candidate.content
+      : "Unknown error";
+
+  return { code, content };
+};
+
 /**
  * Function to create a tenant using the global WebSocket connection
  * @param tenant Tenant object with the data of the tenant
@@ -79,23 +108,8 @@ export const createTenant = async (tenant: Tenant, security: Security) => {
       tenant: tenant.name,
       webSocketStatus: getWebSocketStatus(),
     });
-    let contentMessage = "Unknown error";
-    let errorContent = "Unknown error";
-
-    if (
-      typeof error === "object" &&
-      error !== null &&
-      "error" in error &&
-      typeof (error as any).error === "object" &&
-      (error as any).error !== null
-    ) {
-      if ("code" in (error as any).error) {
-        contentMessage = (error as any).error.code;
-      }
-      if ("content" in (error as any).error) {
-        errorContent = (error as any).error.content;
-      }
-    }
+    const { code: contentMessage, content: errorContent } =
+      extractWsErrorInfo(error);
     const tenantCreationErrorNotification: Notification = {
       type: "error",
       subtype: errors.tenant.creationError.subtype,
@@ -146,24 +160,8 @@ export const deleteTenant = async (tenant: Tenant, security: string) => {
     return response;
   } catch (err) {
     console.error("Error in tenant deletion WebSocket request:", err);
-    eventHelper.tenant.publish.deletionError(tenant);
-    let contentMessage = "Unknown error";
-    let errorContent = "Unknown error";
-
-    if (
-      typeof err === "object" &&
-      err !== null &&
-      "error" in err &&
-      typeof (err as any).error === "object" &&
-      (err as any).error !== null
-    ) {
-      if ("code" in (err as any).error) {
-        contentMessage = (err as any).error.code;
-      }
-      if ("content" in (err as any).error) {
-        errorContent = (err as any).error.content;
-      }
-    }
+    const { code: contentMessage, content: errorContent } =
+      extractWsErrorInfo(err);
     const tenantDeletionErrorNotification: Notification = {
       type: "error",
       subtype: errors.tenant.deletionError.subtype,
@@ -244,24 +242,8 @@ export const updateTenant = async (tenant: Tenant, security: string) => {
     return response;
   } catch (err) {
     console.error("Error in tenant update WebSocket request:", err);
-    eventHelper.tenant.publish.updateError(tenant);
-    let contentMessage = "Unknown error";
-    let errorContent = "Unknown error";
-
-    if (
-      typeof err === "object" &&
-      err !== null &&
-      "error" in err &&
-      typeof (err as any).error === "object" &&
-      (err as any).error !== null
-    ) {
-      if ("code" in (err as any).error) {
-        contentMessage = (err as any).error.code;
-      }
-      if ("content" in (err as any).error) {
-        errorContent = (err as any).error.content;
-      }
-    }
+    const { code: contentMessage, content: errorContent } =
+      extractWsErrorInfo(err);
     const tenantUpdateErrorNotification: Notification = {
       type: "error",
       subtype: errors.tenant.updateError.subtype,
@@ -586,23 +568,8 @@ export const createRegistry = async (
       webSocketStatus: getWebSocketStatus(),
     });
 
-    let contentMessage = "Unknown error";
-    let errorContent = "Unknown error";
-
-    if (
-      typeof error === "object" &&
-      error !== null &&
-      "error" in error &&
-      typeof (error as any).error === "object" &&
-      (error as any).error !== null
-    ) {
-      if ("code" in (error as any).error) {
-        contentMessage = (error as any).error.code;
-      }
-      if ("content" in (error as any).error) {
-        errorContent = (error as any).error.content;
-      }
-    }
+    const { code: contentMessage, content: errorContent } =
+      extractWsErrorInfo(error);
 
     const dregistryCreationErrorNotification: Notification = {
       type: "error",
@@ -689,23 +656,8 @@ export const updateRegistry = async (
       webSocketStatus: getWebSocketStatus(),
     });
 
-    let contentMessage = "Unknown error";
-    let errorContent = "Unknown error";
-
-    if (
-      typeof error === "object" &&
-      error !== null &&
-      "error" in error &&
-      typeof (error as any).error === "object" &&
-      (error as any).error !== null
-    ) {
-      if ("code" in (error as any).error) {
-        contentMessage = (error as any).error.code;
-      }
-      if ("content" in (error as any).error) {
-        errorContent = (error as any).error.content;
-      }
-    }
+    const { code: contentMessage, content: errorContent } =
+      extractWsErrorInfo(error);
 
     const dregistryUpdateErrorNotification: Notification = {
       type: "error",
@@ -773,23 +725,8 @@ export const deleteRegistry = async (
       webSocketStatus: getWebSocketStatus(),
     });
 
-    let contentMessage = "Unknown error";
-    let errorContent = "Unknown error";
-
-    if (
-      typeof error === "object" &&
-      error !== null &&
-      "error" in error &&
-      typeof (error as any).error === "object" &&
-      (error as any).error !== null
-    ) {
-      if ("code" in (error as any).error) {
-        contentMessage = (error as any).error.code;
-      }
-      if ("content" in (error as any).error) {
-        errorContent = (error as any).error.content;
-      }
-    }
+    const { code: contentMessage, content: errorContent } =
+      extractWsErrorInfo(error);
 
     const dregistryDeletionErrorNotification: Notification = {
       type: "error",
@@ -859,23 +796,8 @@ export const inviteUser = async (
       role: role,
       webSocketStatus: getWebSocketStatus(),
     });
-    let contentMessage = "Unknown error";
-    let errorContent = "Unknown error";
-
-    if (
-      typeof error === "object" &&
-      error !== null &&
-      "error" in error &&
-      typeof (error as any).error === "object" &&
-      (error as any).error !== null
-    ) {
-      if ("code" in (error as any).error) {
-        contentMessage = (error as any).error.code;
-      }
-      if ("content" in (error as any).error) {
-        errorContent = (error as any).error.content;
-      }
-    }
+    const { code: contentMessage, content: errorContent } =
+      extractWsErrorInfo(error);
     const tenantInviteErrorNotification: Notification = {
       type: "error",
       subtype: errors.tenant.userInviteError.subtype,
@@ -938,23 +860,8 @@ export const removeUser = async (
       userId: userId,
       webSocketStatus: getWebSocketStatus(),
     });
-    let contentMessage = "Unknown error";
-    let errorContent = "Unknown error";
-
-    if (
-      typeof error === "object" &&
-      error !== null &&
-      "error" in error &&
-      typeof (error as any).error === "object" &&
-      (error as any).error !== null
-    ) {
-      if ("code" in (error as any).error) {
-        contentMessage = (error as any).error.code;
-      }
-      if ("content" in (error as any).error) {
-        errorContent = (error as any).error.content;
-      }
-    }
+    const { code: contentMessage, content: errorContent } =
+      extractWsErrorInfo(error);
     const tenantUserRemovedErrorNotification: Notification = {
       type: "error",
       subtype: errors.tenant.userRemovedError.subtype,
@@ -1021,23 +928,8 @@ export const updateUserRole = async (
       role: role,
       webSocketStatus: getWebSocketStatus(),
     });
-    let contentMessage = "Unknown error";
-    let errorContent = "Unknown error";
-
-    if (
-      typeof error === "object" &&
-      error !== null &&
-      "error" in error &&
-      typeof (error as any).error === "object" &&
-      (error as any).error !== null
-    ) {
-      if ("code" in (error as any).error) {
-        contentMessage = (error as any).error.code;
-      }
-      if ("content" in (error as any).error) {
-        errorContent = (error as any).error.content;
-      }
-    }
+    const { code: contentMessage, content: errorContent } =
+      extractWsErrorInfo(error);
     const tenantUserUpdatedErrorNotification: Notification = {
       type: "error",
       subtype: errors.tenant.roleUpdateError.subtype,
@@ -1092,23 +984,8 @@ export const acceptInvite = async (tenant: string, security: string) => {
       tenant: tenant,
       webSocketStatus: getWebSocketStatus(),
     });
-    let contentMessage = "Unknown error";
-    let errorContent = "Unknown error";
-
-    if (
-      typeof error === "object" &&
-      error !== null &&
-      "error" in error &&
-      typeof (error as any).error === "object" &&
-      (error as any).error !== null
-    ) {
-      if ("code" in (error as any).error) {
-        contentMessage = (error as any).error.code;
-      }
-      if ("content" in (error as any).error) {
-        errorContent = (error as any).error.content;
-      }
-    }
+    const { code: contentMessage, content: errorContent } =
+      extractWsErrorInfo(error);
     const tenantInviteAcceptedErrorNotification: Notification = {
       type: "error",
       subtype: errors.tenant.inviteAcceptError.subtype,
@@ -1177,23 +1054,8 @@ export const rejectInvite = async (tenant: string, security: string, leave: bool
       tenant: tenant,
       webSocketStatus: getWebSocketStatus(),
     });
-    let contentMessage = "Unknown error";
-    let errorContent = "Unknown error";
-
-    if (
-      typeof error === "object" &&
-      error !== null &&
-      "error" in error &&
-      typeof (error as any).error === "object" &&
-      (error as any).error !== null
-    ) {
-      if ("code" in (error as any).error) {
-        contentMessage = (error as any).error.code;
-      }
-      if ("content" in (error as any).error) {
-        errorContent = (error as any).error.content;
-      }
-    }
+    const { code: contentMessage, content: errorContent } =
+      extractWsErrorInfo(error);
     const tenantInviteRejectedErrorNotification: Notification = {
       type: "error",
       subtype: errors.tenant.inviteRejectError.subtype,

package/helpers/token-helper.ts

@@ -5,6 +5,7 @@ interface HandleTokenEventParams {
   eventData: any;
   tokenMap: Map<string, Token>;
   userData: UserData;
+  deletedTokenIds: Set<string>;
 }
 
 interface HandleTokenEventResult {
@@ -24,10 +25,26 @@ export const handleTokenEvent = ({
   eventData,
   tokenMap,
   userData,
+  deletedTokenIds,
 }: HandleTokenEventParams): HandleTokenEventResult => {
   const tokenParentKind = eventData.id.parent?.kind;
   const tokenId = eventData.id.name;
 
+  if (tokenParentKind === "user" && deletedTokenIds.has(tokenId)) {
+    // A tombstoned token (already explicitly deleted by the user) must
+    // never be resurrected by a stale/out-of-order "token" event -
+    // e.g. one reflecting backend state that hasn't caught up with the
+    // deletion yet.
+    return {
+      isUserToken: false,
+      isClusterToken: false,
+      userToken: null,
+      clusterToken: null,
+      updatedUserTokens: userData.tokens,
+      tokenId,
+    };
+  }
+
   if (tokenParentKind === "user") {
     const tokenInMap = tokenMap.get(tokenId);
     
@@ -112,6 +129,7 @@ interface HandleTokenDeletionParams {
   tokenId: string;
   tokenMap: Map<string, Token>;
   userData: UserData;
+  deletedTokenIds: Set<string>;
 }
 
 interface HandleTokenDeletionResult {
@@ -124,7 +142,9 @@ export const handleTokenDeletion = ({
   tokenId,
   tokenMap,
   userData,
+  deletedTokenIds,
 }: HandleTokenDeletionParams): HandleTokenDeletionResult => {
+  deletedTokenIds.add(tokenId);
   const tokenIndex = userData.tokens.findIndex((t) => t.name === tokenId);
   if (tokenIndex === -1) {
     return {

package/package.json

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

package/websocket-manager.ts

@@ -174,6 +174,7 @@ let accountsMap = new Map<string, Account>();
 let revisionsMap = new Map<string, Revision>();
 let roleMap = new Map<string, Role[]>();
 let tokenMap = new Map<string, Token>();
+let deletedTokenIds = new Set<string>();
 let platformInfo: Platform | null = null;
 let isPlatformInfoLoading = false;
 let isPlatformInfoLoaded = false;
@@ -639,7 +640,11 @@ const rebuildHierarchy = () => {
     notificationsEnabled: preservedUserData.notificationsEnabled,
     organizations: Array.from(organizationsMap.values()),
     clusterTokens: Array.from(clusterTokensMap.values()),
-    tokens: tokenMap.size > 0 ? (preservedUserData.tokens || []).filter(t => tokenMap.has(t.name)) : (preservedUserData.tokens || []),
+    tokens: (
+      tokenMap.size > 0
+        ? (preservedUserData.tokens || []).filter(t => tokenMap.has(t.name))
+        : (preservedUserData.tokens || [])
+    ).filter(t => !deletedTokenIds.has(t.name)),
     tenants: Array.from(tenantsMap.values()),
     axebowPlan: preservedUserData.axebowPlan,
     companyName: preservedUserData.companyName,
@@ -1129,6 +1134,7 @@ const handleEvent = async (message: WSMessage) => {
           eventData,
           tokenMap,
           userData,
+          deletedTokenIds,
         });
 
         if (tokenResult.isUserToken) {
@@ -1518,6 +1524,7 @@ const handleOperationSuccess = (operation: PendingOperation, response: any) => {
             tokenId: deletedTokenId,
             tokenMap,
             userData,
+            deletedTokenIds,
           });
           if (tokenDeletionResult.removed) {
             userData.tokens = tokenDeletionResult.updatedUserTokens;
@@ -1916,6 +1923,7 @@ const handleDeleteEvent = async (message: WSMessage) => {
       tokenId: keyParts.token,
       tokenMap,
       userData,
+      deletedTokenIds,
     });
     if (tokenDeletionResult.removed) {
       userData.tokens = tokenDeletionResult.updatedUserTokens;
@@ -2056,7 +2064,8 @@ export const updateUserComplete = (updatedUserData: UserData): User => {
     );
     const mergedTokens = [...(updatedUserData.tokens || []), ...localOnlyTokens]
       .filter((t, index, arr) => arr.findIndex(x => x.name === t.name) === index)
-      .filter(t => tokenMap.size === 0 || tokenMap.has(t.name));
+      .filter(t => tokenMap.size === 0 || tokenMap.has(t.name))
+      .filter(t => !deletedTokenIds.has(t.name));
 
     userData = {
       id: updatedUserData.id || userData.id,