@kumori/aurora-backend-handler 1.0.7 → 1.0.8

package/api/marketplace-api-service.ts

@@ -1,4 +1,10 @@
-import { Link, MarketplaceItem, MarketplaceService, Notification, Service } from "@kumori/aurora-interfaces";
+import {
+  Link,
+  MarketplaceItem,
+  MarketplaceService,
+  Notification,
+  Service,
+} from "@kumori/aurora-interfaces";
 import { eventHelper } from "../backend-handler";
 import { environment } from "../environment";
 
@@ -59,14 +65,14 @@ let pendingLinks = new Map<string, Link[]>();
  */
 export const deployMarketplaceItem = async (item: MarketplaceService) => {
   const complexDeployment = item.deploymentData.serverChannels.find(
-    (channel) => channel.isPublic
+    (channel) => channel.isPublic,
   );
   if (complexDeployment !== undefined) {
     try {
       const formData = await deployServiceHelper(item.deploymentData, item);
 
       const url = new URL(
-        `${environment.apiServer.baseUrl}/api/${environment.apiServer.apiVersion}/tenant/${item.deploymentData.tenant}/service/${item.deploymentData.name}`
+        `${environment.apiServer.baseUrl}/api/${environment.apiServer.apiVersion}/tenant/${item.deploymentData.tenant}/service/${item.deploymentData.name}`,
       );
       url.searchParams.append("dryrun", "false");
       url.searchParams.append("accept", "true");
@@ -86,7 +92,7 @@ export const deployMarketplaceItem = async (item: MarketplaceService) => {
       const jsonResponse = await response.json();
 
       const isTimeout = jsonResponse?.events?.some(
-        (event: any) => event.content === "_timeout_"
+        (event: any) => event.content === "_timeout_",
       );
 
       if (isTimeout) {
@@ -114,7 +120,7 @@ export const deployMarketplaceItem = async (item: MarketplaceService) => {
           resource.type === "bool" ||
           resource.type === "boolean" ||
           resource.type === "fileContent" ||
-          resource.type === "array"
+          resource.type === "array",
       )
       .map((resource) => {
         if (resource.type === "string") {
@@ -163,59 +169,67 @@ export const deployMarketplaceItem = async (item: MarketplaceService) => {
 
     const deploymentData: Service = item.deploymentData as unknown as Service;
     const url = new URL(
-      `${environment.apiServer.baseUrl}/api/${environment.apiServer.apiVersion}/tenant/${item.deploymentData.tenant}/service/${deploymentData.name}`
+      `${environment.apiServer.baseUrl}/api/${environment.apiServer.apiVersion}/tenant/${item.deploymentData.tenant}/service/${deploymentData.name}`,
     );
     url.searchParams.append("dsl", "true");
-    const parametersObj = deploymentConfigParameters.reduce((acc, param) => {
-      const paramMetadata = item.parameterList.find(
-        (p) => p.name === param.name
-      );
-      if (paramMetadata && (paramMetadata as any).parent === "accesspolicies") {
-        if (!acc.accesspolicies) {
-          acc.accesspolicies = {};
+    const parametersObj = deploymentConfigParameters.reduce(
+      (acc, param) => {
+        const paramMetadata = item.parameterList.find(
+          (p) => p.name === param.name,
+        );
+        if (
+          paramMetadata &&
+          (paramMetadata as any).parent === "accesspolicies"
+        ) {
+          if (!acc.accesspolicies) {
+            acc.accesspolicies = {};
+          }
+          acc.accesspolicies[param.name] = param.value;
+        } else {
+          acc[param.name] = param.value;
         }
-        acc.accesspolicies[param.name] = param.value;
-      } else {
-        acc[param.name] = param.value;
-      }
-      return acc;
-    }, {} as { [key: string]: any });
-
-    const resourcesObj = item.resourceList.reduce((acc, resource: any) => {
-      if (resource.type === "secret") {
-        acc[resource.name] = {
-          secret: resource.value as string,
-        } as unknown as DeploymentResource;
-      } else if (resource.type === "volume") {
-        acc[resource.name] = {
-          volume: {
-            kind: "storage",
-            type: resource.kind,
-            size: Number(resource.value || 1),
-            unit: "G",
-          },
-        } as unknown as DeploymentResource;
-      } else if (resource.type === "domain") {
-        acc[resource.name] = {
-          domain: resource.value,
-        } as unknown as DeploymentResource;
-      } else if (resource.type === "certificate") {
-        acc[resource.name] = {
-          certificate: resource.value,
-        } as unknown as DeploymentResource;
-      } else if (resource.type === "ca") {
-        acc[resource.name] = {
-          ca: resource.value,
-        } as unknown as DeploymentResource;
-      }
-      else if (resource.type === "port") {
-        acc[resource.name] = {
-          port: resource.value,
-        } as unknown as DeploymentResource;
-      }
+        return acc;
+      },
+      {} as { [key: string]: any },
+    );
 
-      return acc;
-    }, {} as { [key: string]: DeploymentResource });
+    const resourcesObj = item.resourceList.reduce(
+      (acc, resource: any) => {
+        if (resource.type === "secret") {
+          acc[resource.name] = {
+            secret: resource.value as string,
+          } as unknown as DeploymentResource;
+        } else if (resource.type === "volume") {
+          acc[resource.name] = {
+            volume: {
+              kind: "storage",
+              type: resource.kind,
+              size: Number(resource.value || 1),
+              unit: "G",
+            },
+          } as unknown as DeploymentResource;
+        } else if (resource.type === "domain") {
+          acc[resource.name] = {
+            domain: resource.value,
+          } as unknown as DeploymentResource;
+        } else if (resource.type === "certificate") {
+          acc[resource.name] = {
+            certificate: resource.value,
+          } as unknown as DeploymentResource;
+        } else if (resource.type === "ca") {
+          acc[resource.name] = {
+            ca: resource.value,
+          } as unknown as DeploymentResource;
+        } else if (resource.type === "port") {
+          acc[resource.name] = {
+            port: resource.value,
+          } as unknown as DeploymentResource;
+        }
+
+        return acc;
+      },
+      {} as { [key: string]: DeploymentResource },
+    );
 
     const isInbound = item.module === "builtins/inbound";
 
@@ -224,19 +238,19 @@ export const deployMarketplaceItem = async (item: MarketplaceService) => {
         (resource) =>
           resource.type === "certificate" ||
           resource.name.toLowerCase().includes("cert") ||
-          resource.name === "servercert"
+          resource.name === "servercert",
       );
 
       const hasDomain = item.resourceList.some(
         (resource) =>
           resource.type === "domain" ||
           resource.name.toLowerCase().includes("domain") ||
-          resource.name === "serverdomain"
+          resource.name === "serverdomain",
       );
       const hasPort = item.resourceList.some(
         (resource) =>
           resource.type === "port" ||
-          resource.name.toLowerCase().includes("port")
+          resource.name.toLowerCase().includes("port"),
       );
       let correctType = "tcp";
       let requiredParameters: { [key: string]: any } = {};
@@ -266,7 +280,7 @@ export const deployMarketplaceItem = async (item: MarketplaceService) => {
               name: r.name,
               type: r.type,
             })),
-          }
+          },
         );
       }
       Object.assign(parametersObj, requiredParameters);
@@ -275,25 +289,25 @@ export const deployMarketplaceItem = async (item: MarketplaceService) => {
     const serviceName = item.serviceName.startsWith("./")
       ? item.serviceName.split("./")[1]
       : item.serviceName.startsWith(".")
-      ? item.serviceName.split(".")[1]
-      : item.serviceName;
+        ? item.serviceName.split(".")[1]
+        : item.serviceName;
 
     const scale =
       item.type === "component" || item.serviceName === ""
         ? { hsize: 1 }
         : item.schema?.name === "builtins/inbound"
-        ? { detail: {} }
-        : item.type === "service" && item.roles && Array.isArray(item.roles)
-        ? {
-            detail: item.roles.reduce(
-              (acc, role) => ({
-                ...acc,
-                [role]: { hsize: 1 },
-              }),
-              {}
-            ),
-          }
-        : { detail: { [`${item.artifactName}`]: { hsize: 1 } } };
+          ? { detail: {} }
+          : item.type === "service" && item.roles && Array.isArray(item.roles)
+            ? {
+                detail: item.roles.reduce(
+                  (acc, role) => ({
+                    ...acc,
+                    [role]: { hsize: 1 },
+                  }),
+                  {},
+                ),
+              }
+            : { detail: { [`${item.artifactName}`]: { hsize: 1 } } };
 
     const scaling: {
       simple: {
@@ -371,7 +385,7 @@ export const deployMarketplaceItem = async (item: MarketplaceService) => {
     const jsonResponse = await response.json();
 
     const isTimeout = jsonResponse?.events?.some(
-      (event: any) => event.content === "_timeout_"
+      (event: any) => event.content === "_timeout_",
     );
 
     if (isTimeout) {
@@ -396,7 +410,7 @@ export const deployMarketplaceItem = async (item: MarketplaceService) => {
 
 export const getMarketplaceItems = async (
   tenants: string[],
-  security: string
+  security: string,
 ) => {
   await initializeGlobalWebSocketClient(security);
   const promises = tenants.map(async (tenant) => {
@@ -406,7 +420,7 @@ export const getMarketplaceItems = async (
         { tenant },
         30000,
         "GET",
-        tenant
+        tenant,
       );
 
       const tenantItems: MarketplaceItem[] = [];
@@ -450,19 +464,19 @@ export const getMarketplaceItems = async (
             const schemaData = await getMarketplaceSchema(
               tenant,
               item,
-              security
+              security,
             );
             item.schema = schemaData;
           } catch (schemaError) {
             console.error(
               `Error cargando schema para ${item.name}:`,
-              schemaError
+              schemaError,
             );
             item.schema = undefined;
           }
 
           return item;
-        }
+        },
       );
 
       const processedItems = await Promise.all(itemPromises);
@@ -482,7 +496,7 @@ export const getMarketplaceItems = async (
 export const getMarketplaceSchema = async (
   tenant: string,
   marketplaceItem: MarketplaceItem,
-  security: string
+  security: string,
 ): Promise<
   | {
       resources: {
@@ -530,7 +544,7 @@ export const getMarketplaceSchema = async (
       requestPayload,
       30000,
       "GET",
-      tenant
+      tenant,
     );
 
     const nameKeys = Object.keys(response.data);
@@ -643,22 +657,46 @@ function processSchema(schema: any, schemaType: string) {
           param.default !== undefined
             ? param.default
             : param.enum
-            ? param.enum[0]
-            : param.const
-            ? param.const
-            : undefined,
+              ? param.enum[0]
+              : param.const
+                ? param.const
+                : undefined,
       });
     });
   }
 
+  const volumeTypes = [
+    "Registered",
+    "NonReplicated",
+    "Persisted",
+    "Volatile",
+    "Ephemeral",
+    "Persistent",
+  ];
+
+  const isVolumeResource = (resourceValue: any): boolean => {
+    if (resourceValue.oneOf && Array.isArray(resourceValue.oneOf)) {
+      return resourceValue.oneOf.some((option: any) => {
+        if (option.oneOf && Array.isArray(option.oneOf)) {
+          return option.oneOf.some((nestedOption: any) => {
+            const typeName =
+              nestedOption?.properties?.$kdsl?.const?.NamedType?.Name;
+            return typeName && volumeTypes.includes(typeName);
+          });
+        }
+        const typeName = option?.properties?.$kdsl?.const?.NamedType?.Name;
+        return typeName && volumeTypes.includes(typeName);
+      });
+    }
+    return false;
+  };
+
   const resourceProps = schema.properties?.resource;
   if (resourceProps?.properties) {
     Object.entries(resourceProps.properties).forEach(([key, value]) => {
-      if (
-        key.toLowerCase() === "data" ||
-        key.toLowerCase() === "jetstreamdata" ||
-        key.toLowerCase() === "shared"
-      ) {
+      const resourceValue = value as any;
+
+      if (isVolumeResource(resourceValue)) {
         resources.push({
           name: key,
           type: "volume",
@@ -666,7 +704,6 @@ function processSchema(schema: any, schemaType: string) {
           defaultValue: undefined,
         });
       } else {
-        const resourceValue = value as any;
         let resourceType = "";
         let defaultValue: string | undefined = undefined;
 
@@ -741,7 +778,7 @@ function processSchema(schema: any, schemaType: string) {
             type: "client",
             resource,
           });
-        }
+        },
       );
     }
     if (srvProps.server?.properties) {
@@ -771,7 +808,7 @@ function processSchema(schema: any, schemaType: string) {
             type: "server",
             resource,
           });
-        }
+        },
       );
     }
     if (srvProps.duplex?.properties) {
@@ -801,7 +838,7 @@ function processSchema(schema: any, schemaType: string) {
             type: "duplex",
             resource,
           });
-        }
+        },
       );
     }
   }
@@ -819,17 +856,17 @@ const generateLinkBody = (data: Service, link: Link) => {
     const originInClient = data.clientChannels.find(
       (channel) =>
         channel.name === link.originChannel ||
-        channel.from === link.originChannel
+        channel.from === link.originChannel,
     );
     const originInServer = data.serverChannels.find(
       (channel) =>
         channel.name === link.originChannel ||
-        channel.from === link.originChannel
+        channel.from === link.originChannel,
     );
     const originInDuplex = data.duplexChannels.find(
       (channel) =>
         channel.name === link.originChannel ||
-        channel.from === link.originChannel
+        channel.from === link.originChannel,
     );
 
     if (originInClient) {
@@ -855,17 +892,17 @@ const generateLinkBody = (data: Service, link: Link) => {
     const targetInClient = data.clientChannels.find(
       (channel) =>
         channel.name === link.targetChannel ||
-        channel.from === link.targetChannel
+        channel.from === link.targetChannel,
     );
     const targetInServer = data.serverChannels.find(
       (channel) =>
         channel.name === link.targetChannel ||
-        channel.from === link.targetChannel
+        channel.from === link.targetChannel,
     );
     const targetInDuplex = data.duplexChannels.find(
       (channel) =>
         channel.name === link.targetChannel ||
-        channel.from === link.targetChannel
+        channel.from === link.targetChannel,
     );
 
     if (targetInClient) {
@@ -889,7 +926,7 @@ const generateLinkBody = (data: Service, link: Link) => {
     }
   } else {
     console.warn(
-      `Servicio actual no involucrado en el enlace: current=${data.name}, origin=${link.origin}, target=${link.target}`
+      `Servicio actual no involucrado en el enlace: current=${data.name}, origin=${link.origin}, target=${link.target}`,
     );
     linkBody = {
       client_tenant: data.tenant,
@@ -918,7 +955,7 @@ const linkPendingServices = async (service: Service, token: string) => {
             linkBody,
             30000,
             "LINK",
-            service.name
+            service.name,
           );
 
           const notification: Notification = {
@@ -952,7 +989,7 @@ const linkPendingServices = async (service: Service, token: string) => {
           };
           eventHelper.notification.publish.creation(notification);
         }
-      })
+      }),
     );
   }
 };
@@ -963,7 +1000,7 @@ const linkPendingServices = async (service: Service, token: string) => {
  */
 export const loadMarketplaceItemsForTenant = async (
   tenant: string,
-  security: string
+  security: string,
 ) => {
   try {
     await initializeGlobalWebSocketClient(security);
@@ -973,7 +1010,7 @@ export const loadMarketplaceItemsForTenant = async (
       { tenant },
       30000,
       "GET",
-      tenant
+      tenant,
     );
     const items = response.data?.items || [];
     if (!Array.isArray(items) || items.length === 0) {
@@ -1006,13 +1043,13 @@ export const loadMarketplaceItemsForTenant = async (
         const schemaData = await getMarketplaceSchema(
           tenant,
           marketplaceItem,
-          security
+          security,
         );
         marketplaceItem.schema = schemaData;
       } catch (schemaError) {
         console.error(
           `Error loading schema for ${marketplaceItem.name}:`,
-          schemaError
+          schemaError,
         );
         marketplaceItem.schema = undefined;
       }
@@ -1024,7 +1061,7 @@ export const loadMarketplaceItemsForTenant = async (
   } catch (error) {
     console.error(
       `Error loading marketplace items for tenant ${tenant}:`,
-      error
+      error,
     );
     return [];
   }

package/package.json

@@ -23,7 +23,7 @@
     "ws": "^8.18.2"
   },
   "name": "@kumori/aurora-backend-handler",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "backend handler",
   "main": "backend-handler.ts",
   "repository": {