@kumori/aurora-backend-handler 1.0.100 → 1.0.112

package/api/marketplace-api-service.ts

@@ -1,4 +1,5 @@
 import {
+  getWuiErrorCode,
   Link,
   MarketplaceItem,
   MarketplaceService,
@@ -59,10 +60,7 @@ type DeploymentResource =
   | Port<DeploymentResourceSpec>
   | Certificate<DeploymentResourceSpec>;
 let pendingLinks = new Map<string, Link[]>();
-/**
- * Function to deploy a marketplace item
- * @param item A MarketplaceService object containing the item to deploy
- */
+
 export const deployMarketplaceItem = async (item: MarketplaceService) => {
   const complexDeployment = item.deploymentData.serverChannels.find(
     (channel) => channel.isPublic,
@@ -79,10 +77,10 @@ export const deployMarketplaceItem = async (item: MarketplaceService) => {
       url.searchParams.append("wait", "30000");
       url.searchParams.append("validate", "true");
       url.searchParams.append("dsl", "true");
-
       const response = await fetch(url.toString(), {
         method: "POST",
         body: formData,
+        credentials: "include",
       });
 
       if (!response.ok) {
@@ -294,24 +292,14 @@ export const deployMarketplaceItem = async (item: MarketplaceService) => {
 
     const scale =
       item.type === "component" || item.serviceName === ""
-        ? { hsize: 1 }
+        ? { hsize: item.deploymentData.role[0].hsize || 0 }
         : item.schema?.name === "builtins/inbound"
           ? { detail: {} }
           : item.type === "service" && item.roles && Array.isArray(item.roles)
             ? {
                 detail: {},
               }
-            : // ? {
-              //     detail: item.roles.reduce(
-              //       (acc, role) => ({
-              //         ...acc,
-              //         [role]: { hsize: 1 },
-              //       }),
-              //       {},
-              //     ),
-              //   }
-              { detail: {} };
-    // : { detail: { [`${item.artifactName}`]: { hsize: 1 } } };
+            : { detail: {} };
 
     const scaling: {
       simple: {
@@ -380,6 +368,7 @@ export const deployMarketplaceItem = async (item: MarketplaceService) => {
         "Content-Type": "application/json",
       },
       body: JSON.stringify(itemBody),
+      credentials: "include",
     });
 
     if (!response.ok) {
@@ -462,23 +451,9 @@ export const getMarketplaceItems = async (
             domain: (value as any).domain,
             type: (value as any).artifactTypes[0],
             artifact: (value as any).artifact,
+            schema: undefined,
           };
 
-          try {
-            const schemaData = await getMarketplaceSchema(
-              tenant,
-              item,
-              security,
-            );
-            item.schema = schemaData;
-          } catch (schemaError) {
-            console.error(
-              `Error cargando schema para ${item.name}:`,
-              schemaError,
-            );
-            item.schema = undefined;
-          }
-
           return item;
         },
       );
@@ -967,7 +942,7 @@ const linkPendingServices = async (service: Service, token: string) => {
             subtype: "service-linked",
             date: Date.now().toString(),
             status: "unread",
-            callToAction: false,
+            notificationType: "regular",
             data: {
               service: service.name,
               tenant: service.tenant,
@@ -979,14 +954,14 @@ const linkPendingServices = async (service: Service, token: string) => {
         } catch (linkErr) {
           const notification: Notification = {
             type: "error",
-            subtype: "error-service-link",
+            subtype: getWuiErrorCode("service", "linkService", (linkErr as any).error.code) ?? "error-service-link",
             date: Date.now().toString(),
             info_content: {
               code: (linkErr as any).error.code,
               message: (linkErr as any).error.content,
             },
             status: "unread",
-            callToAction: false,
+            notificationType: "regular",
             data: {
               service: service.name,
               tenant: service.tenant,
@@ -998,11 +973,7 @@ const linkPendingServices = async (service: Service, token: string) => {
     );
   }
 };
-/**
- * Function to load marketplace items for a specific tenant
- * @param tenant Tenant ID
- * @param security Authorization token
- */
+
 export const loadMarketplaceItemsForTenant = async (
   tenant: string,
   security: string,
@@ -1022,47 +993,27 @@ export const loadMarketplaceItemsForTenant = async (
       return [];
     }
 
-    const itemPromises = items.map(async (item: any) => {
-      const marketplaceItem: MarketplaceItem = {
-        tenant: tenant,
-        name: item.module,
-        logo: item.icon,
-        description: item.description,
-        version: item.version,
-        requirements: {
-          cpu: item.requirements?.cpu || 0,
-          memory: item.requirements?.memory || 0,
-        },
-        status: "",
-        instances: [],
-        links: [],
-        resources: [],
-        domain: item.domain,
-        type: item.artifactTypes?.[0],
-        artifact: item.artifact,
-        package: item.package,
-        categories: item.categories || [],
-      };
-
-      try {
-        const schemaData = await getMarketplaceSchema(
-          tenant,
-          marketplaceItem,
-          security,
-        );
-        marketplaceItem.schema = schemaData;
-      } catch (schemaError) {
-        console.error(
-          `Error loading schema for ${marketplaceItem.name}:`,
-          schemaError,
-        );
-        marketplaceItem.schema = undefined;
-      }
-
-      return marketplaceItem;
-    });
-
-    return await Promise.all(itemPromises);
+    return items.map((item: any): MarketplaceItem => ({
+      tenant,
+      name: item.module,
+      logo: item.icon,
+      description: item.description,
+      version: item.version,
+      requirements: {
+        cpu: item.requirements?.cpu || 0,
+        memory: item.requirements?.memory || 0,
+      },
+      status: "",
+      instances: [],
+      links: [],
+      resources: [],
+      domain: item.domain,
+      type: item.artifactTypes?.[0],
+      artifact: item.artifact,
+      package: item.package,
+      categories: item.categories || [],
+      schema: undefined,
+    }));
   } catch (error) {
     console.error(
       `Error loading marketplace items for tenant ${tenant}:`,

package/api/resources-api-service.ts

@@ -1,4 +1,4 @@
-import { Notification, Resource } from "@kumori/aurora-interfaces";
+import { getWuiErrorCode, Notification, Resource } from "@kumori/aurora-interfaces";
 import { eventHelper } from "../backend-handler";
 
 import {
@@ -53,7 +53,7 @@ export const createDomain = async (
       subtype: "resource-created",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: domain.name,
         tenant: tenant
@@ -87,14 +87,14 @@ export const createDomain = async (
     }
     const resourceErrorNotification: Notification = {
       type: "error",
-      subtype: "resource-creation-error",
+      subtype: getWuiErrorCode("resource", "createResource", contentMessage) ?? "resource-creation-error",
       info_content: {
         code: contentMessage,
         message: errorContent,
       },
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: domain.name,
         tenant: tenant
@@ -133,7 +133,7 @@ export const createPort = async (
       subtype: "resource-created",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: port.name,
         tenant: tenant
@@ -167,14 +167,14 @@ export const createPort = async (
     }
     const resourceErrorNotification: Notification = {
       type: "error",
-      subtype: "resource-creation-error",
+      subtype: getWuiErrorCode("resource", "createResource", contentMessage) ?? "resource-creation-error",
       info_content: {
         code: contentMessage,
         message: errorContent,
       },
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: port.name,
         tenant: tenant
@@ -213,7 +213,7 @@ export const createCA = async (
       subtype: "resource-created",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: ca.name,
         tenant: tenant
@@ -247,14 +247,14 @@ export const createCA = async (
     }
     const resourceErrorNotification: Notification = {
       type: "error",
-      subtype: "resource-creation-error",
+      subtype: getWuiErrorCode("resource", "createResource", contentMessage) ?? "resource-creation-error",
       info_content: {
         code: contentMessage,
         message: errorContent,
       },
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: ca.name,
         tenant: tenant
@@ -306,7 +306,7 @@ export const createCertificate = async (
       subtype: "resource-created",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: certificate.name,
         tenant: tenant
@@ -340,14 +340,14 @@ export const createCertificate = async (
     }
     const resourceErrorNotification: Notification = {
       type: "error",
-      subtype: "resource-creation-error",
+      subtype: getWuiErrorCode("resource", "createResource", contentMessage) ?? "resource-creation-error",
       info_content: {
         code: contentMessage,
         message: errorContent,
       },
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: certificate.name,
         tenant: tenant
@@ -386,7 +386,7 @@ export const createSecret = async (
       subtype: "resource-created",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: secret.name,
         tenant: tenant
@@ -420,14 +420,14 @@ export const createSecret = async (
     }
     const resourceErrorNotification: Notification = {
       type: "error",
-      subtype: "resource-creation-error",
+      subtype: getWuiErrorCode("resource", "createResource", contentMessage) ?? "resource-creation-error",
       info_content: {
         code: contentMessage,
         message: errorContent,
       },
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: secret.name,
         tenant: tenant
@@ -486,7 +486,7 @@ export const createVolume = async (
       subtype: "resource-created",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: volume.name,
         tenant: tenant
@@ -520,14 +520,14 @@ export const createVolume = async (
     }
     const resourceErrorNotification: Notification = {
       type: "error",
-      subtype: "resource-creation-error",
+      subtype: getWuiErrorCode("resource", "createResource", contentMessage) ?? "resource-creation-error",
       info_content: {
         code: contentMessage,
         message: errorContent,
       },
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: volume.name,
         tenant: tenant
@@ -587,16 +587,16 @@ const deleteResourceBase = async (
       body,
       30000,
       "DELETE",
-      resource.name
+      resource.name,
+      "resource"
     );
-
     //eventHelper.resource.publish.deleted(resource);
     const resourceNotification: Notification = {
       type: "success",
       subtype: "resource-deleting",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: resource.name,
         type: resource.type,
@@ -626,14 +626,14 @@ const deleteResourceBase = async (
     }
     const resourceErrorNotification: Notification = {
       type: "error",
-      subtype: "resource-deletion-error",
+      subtype: getWuiErrorCode("resource", "deleteResource", contentMessage) ?? "resource-deletion-error",
       info_content: {
         code: contentMessage,
         message: errorContent,
       },
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: resource.name,
         type: resource.type,
@@ -691,7 +691,7 @@ const updateResourceBase = async (
       subtype: "resource-updated",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: resource.name,
         type: resource.type,
@@ -721,14 +721,14 @@ const updateResourceBase = async (
     }
     const resourceErrorNotification: Notification = {
       type: "error",
-      subtype: "resource-update-error",
+      subtype: getWuiErrorCode("resource", "updateResource", contentMessage) ?? "resource-update-error",
       info_content: {
         code: contentMessage,
         message: errorContent,
       },
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: resource.name,
         type: resource.type,
@@ -830,4 +830,4 @@ export const updateResource = async (
     default:
       throw new Error(`Unsupported resource type: ${resource.type}`);
   }
-};
+};

package/api/service-api-service.ts

@@ -6,7 +6,7 @@ import {
   getWebSocketStatus,
   makeGlobalWebSocketRequest,
 } from "../websocket-manager";
-import { Link, Notification, Service } from "@kumori/aurora-interfaces";
+import { getWuiErrorCode, Link, Notification, Service } from "@kumori/aurora-interfaces";
 import { Revision } from "@kumori/aurora-interfaces/interfaces/revision-interface";
 let pendingLinks = new Map<string, Link[]>();
 /**
@@ -40,6 +40,7 @@ export const deployService = async (data: Service, token: string) => {
       const response = await fetch(url.toString(), {
         method: "POST",
         body: formData,
+        credentials: "include",
       });
       if (!response.ok) {
         throw new Error(`HTTP error! status: ${response.status}`);
@@ -66,6 +67,7 @@ export const deployService = async (data: Service, token: string) => {
       const response = await fetch(url.toString(), {
         method: "POST",
         body: formData,
+        credentials: "include",
       });
       if (!response.ok) {
         const jsonResponse = await response.json();
@@ -121,6 +123,7 @@ export const redeployService = async (data: Service) => {
     const response = await fetch(url.toString(), {
       method: "POST",
       body: formData,
+      credentials: "include",
     });
 
     if (!response.ok) {
@@ -349,7 +352,7 @@ export const linkPendingServices = async (service: Service, token: string) => {
             subtype: "service-linked",
             date: Date.now().toString(),
             status: "unread",
-            callToAction: false,
+            notificationType: "regular",
             data: {
               service: service.name,
               tenant: service.tenant,
@@ -361,14 +364,14 @@ export const linkPendingServices = async (service: Service, token: string) => {
         } catch (linkErr) {
           const notification: Notification = {
             type: "error",
-            subtype: "error-service-link",
+            subtype: getWuiErrorCode("service", "linkService", (linkErr as any).error.code) ?? "error-service-link",
             date: Date.now().toString(),
             info_content: {
               code: (linkErr as any).error.code,
               message: (linkErr as any).error.content,
             },
             status: "unread",
-            callToAction: false,
+            notificationType: "regular",
             data: {
               service: service.name,
               tenant: service.tenant,
@@ -447,6 +450,7 @@ export const updateService = async (
       const response = await fetch(url.toString(), {
         method: "POST",
         body: formData,
+        credentials: "include",
       });
       if (!response.ok) {
         throw new Error(`HTTP error! status: ${response.status}`);
@@ -611,7 +615,7 @@ export const updateService = async (
         subtype: "service-updated",
         date: Date.now().toString(),
         status: "unread",
-        callToAction: false,
+        notificationType: "regular",
         data: {
           service: data.name,
           tenant: data.tenant,
@@ -625,14 +629,14 @@ export const updateService = async (
     console.error("Error updating service configuration via WebSocket:", err);
     const notification: Notification = {
       type: "error",
-      subtype: "service-update-error",
+      subtype: getWuiErrorCode("service", "updateRevision", (err as any).error.code) ?? "service-update-error",
       date: Date.now().toString(),
       info_content: {
         code: (err as any).error.code,
         message: (err as any).error.content,
       },
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         service: data.name,
         tenant: data.tenant,
@@ -669,7 +673,7 @@ export const unlinkServices = async (service: Service, token: string) => {
             subtype: "service-unlinking",
             date: Date.now().toString(),
             status: "unread",
-            callToAction: false,
+            notificationType: "regular",
             data: {
               service: service.name,
               tenant: service.tenant,
@@ -682,14 +686,14 @@ export const unlinkServices = async (service: Service, token: string) => {
 
           const notification: Notification = {
             type: "error",
-            subtype: "service-unlink-error",
+            subtype: getWuiErrorCode("service", "unlinkService", (unlinkErr as any).error.code) ?? "service-unlink-error",
             date: Date.now().toString(),
             info_content: {
               code: (unlinkErr as any).error.code,
               message: (unlinkErr as any).error.content,
             },
             status: "unread",
-            callToAction: false,
+            notificationType: "regular",
             data: {
               service: service.name,
               tenant: service.tenant,
@@ -731,7 +735,7 @@ export const updateServiceLinks = async (link: Link, token: string) => {
       //   subtype: "service-unlinked",
       //   date: Date.now().toString(),
       //   status: "unread",
-      //   callToAction: false,
+      //   notificationType: "regular",
       //   data: {
       //     service: link.origin,
       //     tenant: link.tenant,
@@ -744,14 +748,14 @@ export const updateServiceLinks = async (link: Link, token: string) => {
 
       const notification: Notification = {
         type: "error",
-        subtype: "service-unlink-error",
+        subtype: getWuiErrorCode("service", "unlinkService", (unlinkErr as any).error.code) ?? "service-unlink-error",
         date: Date.now().toString(),
         info_content: {
           code: (unlinkErr as any).error.code,
           message: (unlinkErr as any).error.content,
         },
         status: "unread",
-        callToAction: false,
+        notificationType: "regular",
         data: {
           service: link.origin,
           tenant: link.tenant,
@@ -778,7 +782,7 @@ export const updateServiceLinks = async (link: Link, token: string) => {
         subtype: "service-linked",
         date: Date.now().toString(),
         status: "unread",
-        callToAction: false,
+        notificationType: "regular",
         data: {
           service: link.origin,
           tenant: link.tenant,
@@ -790,14 +794,14 @@ export const updateServiceLinks = async (link: Link, token: string) => {
     } catch (linkErr) {
       const notification: Notification = {
         type: "error",
-        subtype: "error-service-link",
+        subtype: getWuiErrorCode("service", "linkService", (linkErr as any).error.code) ?? "error-service-link",
         date: Date.now().toString(),
         info_content: {
           code: (linkErr as any).error.code,
           message: (linkErr as any).error.content,
         },
         status: "unread",
-        callToAction: false,
+        notificationType: "regular",
         data: {
           service: link.origin,
           tenant: link.tenant,
@@ -834,7 +838,7 @@ export const changeRevision = async (data: Service, token: string) => {
       subtype: "revision-updated",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         service: data,
       },
@@ -844,14 +848,14 @@ export const changeRevision = async (data: Service, token: string) => {
   } catch (error) {
     const notification: Notification = {
       type: "error",
-      subtype: "error-revision-update",
+      subtype: getWuiErrorCode("service", "updateRevision", (error as any).error.code) ?? "error-revision-update",
       date: Date.now().toString(),
       info_content: {
         code: (error as any).error.code,
         message: (error as any).error.content,
       },
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         service: data,
       },
@@ -893,7 +897,7 @@ export async function restartInstance(
       subtype: "instance-restarted",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         service: service,
       },
@@ -903,14 +907,14 @@ export async function restartInstance(
   } catch (error) {
     const notification: Notification = {
       type: "error",
-      subtype: "error-instance-update",
+      subtype: getWuiErrorCode("service", "restart", (error as any).error.code) ?? "error-instance-update",
       date: Date.now().toString(),
       info_content: {
         code: (error as any).error.code,
         message: (error as any).error.content,
       },
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         service: service,
       },