@kumori/aurora-backend-handler 1.1.85 → 1.1.87

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,
@@ -200,7 +198,12 @@ export const updateTenant = async (tenant: Tenant, security: string) => {
 
     const updateBody: Record<string, any> = {
       tenant: tenant.name,
-      spec: {
+    };
+    if (hasPlan) {
+      updateBody.provider = tenant.plan!.provider || "";
+      updateBody.plan = tenant.plan!.name;
+    } else {
+      updateBody.spec = {
         registry: !hasNpmRegistry
           ? undefined
           : isNpmRegistryEmpty
@@ -212,12 +215,7 @@ export const updateTenant = async (tenant: Tenant, security: string) => {
                 credentials: tenant.npmRegistry!.credentials,
                 public: tenant.npmRegistry!.public,
               },
-      },
-    };
-
-    if (hasPlan) {
-      updateBody.provider = tenant.plan!.provider || "";
-      updateBody.plan = tenant.plan!.name;
+      };
     }
 
     const response = await makeGlobalWebSocketRequest(
@@ -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,
@@ -452,12 +434,11 @@ export const updateTenantHTTP = async (tenant: Tenant) => {
       tenant.plan?.provider || ""
     );
   }
+  const hasPlan = tenant.plan && tenant.plan?.name !== "" && tenant.plan?.provider !== "";
   const tenantBody =
-    tenant.npmRegistry && tenant.npmRegistry.endpoint !== ""
+    !hasPlan && tenant.npmRegistry && tenant.npmRegistry.endpoint !== ""
       ? {
           tenant: tenant.name,
-          provider: tenant.plan?.provider || "",
-          plan: tenant.plan?.name || "",
           spec: {
             registry: {
               kind: "git",
@@ -468,12 +449,14 @@ export const updateTenantHTTP = async (tenant: Tenant) => {
             },
           },
         }
-      : {
-          tenant: tenant.name,
-          spec: {
-            registry: undefined,
-          },
-        };
+      : hasPlan
+        ? { tenant: tenant.name }
+        : {
+            tenant: tenant.name,
+            spec: {
+              registry: undefined,
+            },
+          };
   const response = await fetch(updateTenantUrl, {
     method: "PATCH",
     headers: {
@@ -586,23 +569,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 +657,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 +726,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 +797,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 +861,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 +929,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 +985,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 +1055,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/package.json

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