@kumori/aurora-backend-handler 1.0.49 → 1.0.51

package/api/account-api-service.ts

@@ -222,7 +222,6 @@ export const createAccount = async (account: Account, security: Security) => {
                   username: account.cloudProvider.username || "",
                   password: account.cloudProvider.password || "",
                   region: account.cloudProvider?.region || "",
-                  project_id: account.cloudProvider?.project_id || "",
                 }
               : {
                   method: providerName,
@@ -334,7 +333,6 @@ export const createAccount = async (account: Account, security: Security) => {
                   password: account.cloudProvider.password || "",
                   region: account.cloudProvider?.region || "",
                   domain: account.cloudProvider?.domain || "",
-                  project_id: account.cloudProvider?.project_id || "",
                 }
               : {
                   method: providerName,
@@ -613,7 +611,6 @@ export const deleteAccount = async (account: Account, security: Security) => {
           credentials: {
             username: account.cloudProvider.username,
             password: account.cloudProvider.password,
-            project_id: account.cloudProvider.project_id || "",
           },
         },
       };
@@ -628,7 +625,6 @@ export const deleteAccount = async (account: Account, security: Security) => {
             username: account.cloudProvider.username,
             password: account.cloudProvider.password,
             domain: account.cloudProvider.domain,
-            project_id: account.cloudProvider.project_id || "",
           },
         },
       };
@@ -994,7 +990,6 @@ export const updateAccount = async (account: Account, security: Security) => {
                 username: account.cloudProvider.username || "",
                 password: account.cloudProvider.password || "",
                 region: account.cloudProvider?.region || "",
-                project_id: account.cloudProvider?.project_id || "",
               }
             : {
                 method: providerName,
@@ -1104,7 +1099,6 @@ export const updateAccount = async (account: Account, security: Security) => {
                 password: account.cloudProvider.password || "",
                 region: account.cloudProvider?.region || "",
                 domain: account.cloudProvider?.domain || "",
-                project_id: account.cloudProvider?.project_id || "",
               }
             : {
                 method: providerName,

package/api/service-api-service.ts

@@ -7,7 +7,6 @@ import {
   makeGlobalWebSocketRequest,
 } from "../websocket-manager";
 import { Link, Notification, Service } from "@kumori/aurora-interfaces";
-import { Revision } from "@kumori/aurora-interfaces/interfaces/revision-interface";
 let pendingLinks = new Map<string, Link[]>();
 /**
  * Function to deploy a service
@@ -16,13 +15,13 @@ let pendingLinks = new Map<string, Link[]>();
 export const deployService = async (data: Service, token: string) => {
   try {
     const url = new URL(
-      `${environment.apiServer.baseUrl}/api/${environment.apiServer.apiVersion}/tenant/${data.tenant}/service/${data.name}`
+      `${environment.apiServer.baseUrl}/api/${environment.apiServer.apiVersion}/tenant/${data.tenant}/service/${data.name}`,
     );
     url.searchParams.append("dryrun", "false");
     url.searchParams.append("accept", "true");
     url.searchParams.append("wait", "30000");
     url.searchParams.append("validate", "true");
-    if(data.dsl){
+    if (data.dsl) {
       url.searchParams.append("dsl", "true");
     }
     if (data.serviceData) {
@@ -33,7 +32,7 @@ export const deployService = async (data: Service, token: string) => {
         JSON.stringify({
           targetAccount: data.account,
           targetEnvironment: data.environment,
-        })
+        }),
       );
       formData.append("labels", JSON.stringify({ project: data.project }));
       formData.append("comment", " ");
@@ -48,7 +47,7 @@ export const deployService = async (data: Service, token: string) => {
       const jsonResponse = await response.json();
 
       const isTimeout = jsonResponse?.events?.some(
-        (event: any) => event.content === "_timeout_"
+        (event: any) => event.content === "_timeout_",
       );
 
       if (isTimeout) {
@@ -81,7 +80,7 @@ export const deployService = async (data: Service, token: string) => {
       const jsonResponse = await response.json();
 
       const isTimeout = jsonResponse?.events?.some(
-        (event: any) => event.content === "_timeout_"
+        (event: any) => event.content === "_timeout_",
       );
 
       if (isTimeout) {
@@ -111,7 +110,7 @@ export const redeployService = async (data: Service) => {
   try {
     const formData = await deployServiceHelper(data);
     const url = new URL(
-      `${environment.apiServer.baseUrl}/api/${environment.apiServer.apiVersion}/tenant/${data.tenant}/service/${data.name}/revision/${data.currentRevision}`
+      `${environment.apiServer.baseUrl}/api/${environment.apiServer.apiVersion}/tenant/${data.tenant}/service/${data.name}/revision/${data.currentRevision}`,
     );
     url.searchParams.append("dryrun", "false");
     url.searchParams.append("accept", "true");
@@ -130,7 +129,7 @@ export const redeployService = async (data: Service) => {
     const jsonResponse = await response.json();
 
     const isTimeout = jsonResponse?.events?.some(
-      (event: any) => event.content === "_timeout_"
+      (event: any) => event.content === "_timeout_",
     );
 
     if (isTimeout) {
@@ -163,7 +162,7 @@ export const deleteService = async (data: Service, security: string) => {
       deleteBody,
       30000,
       "DELETE",
-      data.name
+      data.name,
     );
     return response;
   } catch (err) {
@@ -188,7 +187,7 @@ export const restartService = async (data: Service, security: string) => {
       restartBody,
       30000,
       "RESTART",
-      data.name
+      data.name,
     );
 
     const updatedService: Service = {
@@ -209,30 +208,51 @@ export const restartService = async (data: Service, security: string) => {
   }
 };
 const generateLinkBody = (data: Service, link: Link) => {
-  const originInClient = data.clientChannels.find(
-    (channel) =>
-      channel.name === link.originChannel || channel.from === link.originChannel
-  );
-  const originInServer = data.serverChannels.find(
-    (channel) =>
-      channel.name === link.originChannel || channel.from === link.originChannel
-  );
-  const originInDuplex = data.duplexChannels.find(
-    (channel) =>
-      channel.name === link.originChannel || channel.from === link.originChannel
-  );
-  const targetInClient = data.clientChannels.find(
-    (channel) =>
-      channel.name === link.targetChannel || channel.from === link.targetChannel
-  );
-  const targetInServer = data.serverChannels.find(
-    (channel) =>
-      channel.name === link.targetChannel || channel.from === link.targetChannel
-  );
-  const targetInDuplex = data.duplexChannels.find(
-    (channel) =>
-      channel.name === link.targetChannel || channel.from === link.targetChannel
-  );
+  const isOrigin = data.name === link.origin;
+  const isTarget = data.name === link.target;
+
+  const originInClient = isOrigin
+    ? data.clientChannels.find(
+        (channel) =>
+          channel.name === link.originChannel ||
+          channel.from === link.originChannel,
+      )
+    : undefined;
+  const originInServer = isOrigin
+    ? data.serverChannels.find(
+        (channel) =>
+          channel.name === link.originChannel ||
+          channel.from === link.originChannel,
+      )
+    : undefined;
+  const originInDuplex = isOrigin
+    ? data.duplexChannels.find(
+        (channel) =>
+          channel.name === link.originChannel ||
+          channel.from === link.originChannel,
+      )
+    : undefined;
+  const targetInClient = isTarget
+    ? data.clientChannels.find(
+        (channel) =>
+          channel.name === link.targetChannel ||
+          channel.from === link.targetChannel,
+      )
+    : undefined;
+  const targetInServer = isTarget
+    ? data.serverChannels.find(
+        (channel) =>
+          channel.name === link.targetChannel ||
+          channel.from === link.targetChannel,
+      )
+    : undefined;
+  const targetInDuplex = isTarget
+    ? data.duplexChannels.find(
+        (channel) =>
+          channel.name === link.targetChannel ||
+          channel.from === link.targetChannel,
+      )
+    : undefined;
 
   let linkBody;
   if (originInClient) {
@@ -291,7 +311,7 @@ const generateLinkBody = (data: Service, link: Link) => {
     };
   } else {
     console.warn(
-      `No se encontraron canales para el enlace: origin=${link.origin}, target=${link.target}`
+      `No se encontraron canales para el enlace: origin=${link.origin}, target=${link.target}`,
     );
     linkBody = {
       client_tenant: data.tenant,
@@ -302,6 +322,7 @@ const generateLinkBody = (data: Service, link: Link) => {
       server_channel: link.targetChannel,
     };
   }
+
   return linkBody;
 };
 export const linkPendingServices = async (service: Service, token: string) => {
@@ -319,7 +340,7 @@ export const linkPendingServices = async (service: Service, token: string) => {
             linkBody,
             30000,
             "LINK",
-            service.name
+            service.name,
           );
 
           const notification: Notification = {
@@ -353,7 +374,7 @@ export const linkPendingServices = async (service: Service, token: string) => {
           };
           eventHelper.notification.publish.creation(notification);
         }
-      })
+      }),
     );
   }
 };
@@ -375,7 +396,7 @@ export const requestRevisionData = async (service: Service, token: string) => {
       "GET_REVISION",
       service.name,
       "service",
-      service
+      service,
     );
     return response;
   } catch (err) {
@@ -402,203 +423,163 @@ export const updateService = async (
     //   pendingLinks.set(data.name, newLinksToCreate);
     //   await linkPendingServices(serviceWithNewLinks, token);
     // }
-    const url = new URL(
-      `${environment.apiServer.baseUrl}/api/${environment.apiServer.apiVersion}/tenant/${data.tenant}/service/${data.name}/revision/${data.currentRevision}`,
-    );
-    if (data.dsl) {
-      url.searchParams.append("dsl", "true");
-    }
-    if (data.serviceData) {
-      const formData = new FormData();
-      formData.append("type", "update-bundle");
-      formData.append("bundle", data.serviceData);
-      formData.append(
-        "meta",
-        JSON.stringify({
-          targetAccount: data.account,
-          targetEnvironment: data.environment,
-        }),
-      );
-      formData.append("labels", JSON.stringify({ project: data.project }));
-      formData.append("comment", " ");
-      const response = await fetch(url.toString(), {
-        method: "POST",
-        body: formData,
+
+    const parameterObject: Record<string, any> = {};
+    if (data.parameters && data.parameters.length > 0) {
+      data.parameters.forEach((param) => {
+        const key = param.configKey || param.name;
+        const paramType = param.type?.toLowerCase();
+        if (paramType === "number" || paramType === "integer") {
+          parameterObject[key] = Number(param.value) || 0;
+        } else if (paramType === "boolean") {
+          parameterObject[key] = param.value === "true";
+        } else {
+          parameterObject[key] = param.value;
+        }
       });
-      if (!response.ok) {
-        throw new Error(`HTTP error! status: ${response.status}`);
-      }
+    }
 
-      const jsonResponse = await response.json();
-      const isTimeout = jsonResponse?.events?.some(
-        (event: any) => event.content === "_timeout_",
-      );
+    const resourceObject: Record<string, any> = {};
+    if (data.resources && data.resources.length > 0) {
+      data.resources.forEach((resource) => {
+        if (resource.type === "volume") {
+          resourceObject[resource.name] = {
+            volume: {
+              kind: "storage",
+              size: parseInt(resource.value) || 1,
+              unit: "G",
+              type: resource.kind,
+            },
+          };
+        } else if (resource.type === "secret") {
+          resourceObject[resource.name] = {
+            secret: `${data.tenant}/${resource.value}`,
+          };
+        } else if (resource.type === "domain") {
+          resourceObject[resource.name] = {
+            domain: `${data.tenant}/${resource.value}`,
+          };
+        } else if (resource.type === "ca") {
+          resourceObject[resource.name] = {
+            ca: `${data.tenant}/${resource.value}`,
+          };
+        } else if (resource.type === "certificate") {
+          resourceObject[resource.name] = {
+            certificate: `${data.tenant}/${resource.value}`,
+          };
+        } else if (resource.type === "port") {
+          resourceObject[resource.name] = {
+            port: `${data.tenant}/${resource.value}`,
+          };
+        }
+      });
+    }
 
-      if (isTimeout) {
-        console.error("Timeout en la petición:", {
-          isOk: false,
-          code: "TIMEOUT",
-          error: "_timeout_",
-        });
+    let previousRevision = 1;
+    if (data.currentRevision) {
+      previousRevision = parseInt(data.currentRevision.toString(), 10);
+      if (isNaN(previousRevision)) {
+        console.warn("currentRevision is not a valid number, using 1");
+        previousRevision = 1;
       }
     } else {
-      const parameterObject: Record<string, any> = {};
-      if (data.parameters && data.parameters.length > 0) {
-        data.parameters.forEach((param) => {
-          const key = param.configKey || param.name;
-          const paramType = param.type?.toLowerCase();
-          if (paramType === "number" || paramType === "integer") {
-            parameterObject[key] = Number(param.value) || 0;
-          } else if (paramType === "boolean") {
-            parameterObject[key] = param.value === "true";
-          } else {
-            parameterObject[key] = param.value;
-          }
-        });
-      }
-
-      const resourceObject: Record<string, any> = {};
-      if (data.resources && data.resources.length > 0) {
-        data.resources.forEach((resource) => {
-          if (resource.type === "volume") {
-            resourceObject[resource.name] = {
-              volume: {
-                kind: "storage",
-                size: parseInt(resource.value) || 1,
-                unit: "G",
-                type: resource.kind,
-              },
-            };
-          } else if (resource.type === "secret") {
-            resourceObject[resource.name] = {
-              secret: `${data.tenant}/${resource.value}`,
-            };
-          } else if (resource.type === "domain") {
-            resourceObject[resource.name] = {
-              domain: `${data.tenant}/${resource.value}`,
-            };
-          } else if (resource.type === "ca") {
-            resourceObject[resource.name] = {
-              ca: `${data.tenant}/${resource.value}`,
-            };
-          } else if (resource.type === "certificate") {
-            resourceObject[resource.name] = {
-              certificate: `${data.tenant}/${resource.value}`,
-            };
-          } else if (resource.type === "port") {
-            resourceObject[resource.name] = {
-              port: `${data.tenant}/${resource.value}`,
-            };
-          }
-        });
-      }
+      previousRevision = getLatestRevision(data.revisions) || 1;
+    }
 
-      let previousRevision = 1;
-      if (data.currentRevision) {
-        previousRevision = parseInt(data.currentRevision.toString(), 10);
-        if (isNaN(previousRevision)) {
-          console.warn("currentRevision is not a valid number, using 1");
-          previousRevision = 1;
-        }
-      } else {
-        previousRevision = getLatestRevision(data.revisions) || 1;
-      }
+    const scaleConfig: any = {};
+    if (data.role && data.role.length > 0) {
+      scaleConfig.detail = {};
+      data.role.forEach((role) => {
+        scaleConfig.detail[role.name] = {
+          hsize: role.hsize || scale || data.minReplicas || 1,
+        };
+      });
+    } else {
+      scaleConfig.hsize = scale || data.minReplicas || 1;
+    }
+    const meta = {
+      scaling: {
+        simple:
+          data.role?.reduce(
+            (acc, role) => {
+              if (role.scalling && role.name) {
+                acc[role.name] = {
+                  scale_up: {
+                    cpu: Math.min(parseInt(role.scalling.cpu.up) || 0, 100),
+                    memory: Math.min(
+                      parseInt(role.scalling.memory.up) || 0,
+                      100,
+                    ),
+                  },
+                  scale_down: {
+                    cpu: Math.min(parseInt(role.scalling.cpu.down) || 0, 100),
+                    memory: Math.min(
+                      parseInt(role.scalling.memory.down) || 0,
+                      100,
+                    ),
+                  },
+                  hysteresis: parseInt(role.scalling.histeresys) || 0,
+                  min_replicas: role.scalling.instances.min || 0,
+                  max_replicas: role.scalling.instances.max || 0,
+                };
+              }
+              return acc;
+            },
+            {} as Record<string, any>,
+          ) || {},
+      },
+    };
 
-      const scaleConfig: any = {};
-      if (data.role && data.role.length > 0) {
-        scaleConfig.detail = {};
-        data.role.forEach((role) => {
-          scaleConfig.detail[role.name] = {
-            hsize: role.hsize || scale || data.minReplicas || 1,
-          };
-        });
-      } else {
-        scaleConfig.hsize = scale || data.minReplicas || 1;
-      }
-      const meta = {
-        scaling: {
-          simple:
-            data.role?.reduce(
-              (acc, role) => {
-                if (role.scalling && role.name) {
-                  acc[role.name] = {
-                    scale_up: {
-                      cpu: Math.min(parseInt(role.scalling.cpu.up) || 0, 100),
-                      memory: Math.min(
-                        parseInt(role.scalling.memory.up) || 0,
-                        100,
-                      ),
-                    },
-                    scale_down: {
-                      cpu: Math.min(parseInt(role.scalling.cpu.down) || 0, 100),
-                      memory: Math.min(
-                        parseInt(role.scalling.memory.down) || 0,
-                        100,
-                      ),
-                    },
-                    hysteresis: parseInt(role.scalling.histeresys) || 0,
-                    min_replicas: role.scalling.instances.min || 0,
-                    max_replicas: role.scalling.instances.max || 0,
-                  };
-                }
-                return acc;
-              },
-              {} as Record<string, any>,
-            ) || {},
+    const updateBody = {
+      spec: {
+        type: "update-config",
+        comment: "Service configuration update",
+        config: {
+          parameter: parameterObject,
+          resource: resourceObject,
+          resilience: 0,
+          scale: scaleConfig,
         },
-      };
+        meta: meta,
+      },
+      tenant: data.tenant,
+      service: data.name,
+      previous: previousRevision,
+    };
 
-      const updateBody = {
-        spec: {
-          type: "update-config",
-          comment: "Service configuration update",
-          config: {
-            parameter: parameterObject,
-            resource: resourceObject,
-            resilience: 0,
-            scale: scaleConfig,
-          },
-          meta: meta,
-        },
-        tenant: data.tenant,
-        service: data.name,
-        previous: previousRevision,
-      };
+    const response = await makeGlobalWebSocketRequest(
+      "revision:update_revision",
+      updateBody,
+      30000,
+      "UPDATE_CONFIG",
+      data.name,
+    );
 
-      const response = await makeGlobalWebSocketRequest(
-        "revision:update_revision",
-        updateBody,
-        30000,
-        "UPDATE_CONFIG",
-        data.name,
-      );
-      const updatedService: Service = {
-        ...data,
-        status: {
-          code: "PENDING",
-          message: "",
-          timestamp: "",
-          args: [],
-        },
-      };
-      eventHelper.service.publish.updated(updatedService);
-  
-      const updateNotification: Notification = {
-        type: "success",
-        subtype: "service-updated",
-        date: Date.now().toString(),
-        status: "unread",
-        callToAction: false,
-        data: {
-          service: data.name,
-          tenant: data.tenant,
-        },
-      };
-  
-      eventHelper.notification.publish.creation(updateNotification);
-      return response;
-    }
+    const updatedService: Service = {
+      ...data,
+      status: {
+        code: "PENDING",
+        message: "",
+        timestamp: "",
+        args: [],
+      },
+    };
+    eventHelper.service.publish.updated(updatedService);
 
+    const updateNotification: Notification = {
+      type: "success",
+      subtype: "service-updated",
+      date: Date.now().toString(),
+      status: "unread",
+      callToAction: false,
+      data: {
+        service: data.name,
+        tenant: data.tenant,
+      },
+    };
+
+    eventHelper.notification.publish.creation(updateNotification);
+    return response;
   } catch (err) {
     console.error("Error updating service configuration via WebSocket:", err);
     const notification: Notification = {
@@ -623,7 +604,7 @@ export const updateService = async (
 };
 export const unlinkServices = async (service: Service, token: string) => {
   const deleteLinks: Link[] = service.links.filter(
-    (link) => link.delete === true
+    (link) => link.delete === true,
   );
   if (deleteLinks.length > 0) {
     await Promise.all(
@@ -638,7 +619,7 @@ export const unlinkServices = async (service: Service, token: string) => {
             unlinkBody,
             30000,
             "UNLINK",
-            service.name
+            service.name,
           );
 
           const unlinkNotification: Notification = {
@@ -674,7 +655,7 @@ export const unlinkServices = async (service: Service, token: string) => {
           };
           eventHelper.notification.publish.creation(notification);
         }
-      })
+      }),
     );
   }
 };
@@ -699,7 +680,7 @@ export const updateServiceLinks = async (link: Link, token: string) => {
         linkBody,
         30000,
         "UNLINK",
-        link.origin
+        link.origin,
       );
 
       // const unlinkNotification: Notification = {
@@ -745,7 +726,7 @@ export const updateServiceLinks = async (link: Link, token: string) => {
         linkBody,
         30000,
         "LINK",
-        link.origin
+        link.origin,
       );
 
       const notification: Notification = {
@@ -801,7 +782,7 @@ export const changeRevision = async (data: Service, token: string) => {
       revisionBody,
       30000,
       "UPDATE_REVISION",
-      data.name
+      data.name,
     );
     const notification: Notification = {
       type: "success",
@@ -833,10 +814,10 @@ export const changeRevision = async (data: Service, token: string) => {
     eventHelper.notification.publish.creation(notification);
   }
 };
-function getLatestRevision(revisions: Revision[]): number | null {
+function getLatestRevision(revisions: string[]): number | null {
   if (!revisions || revisions.length === 0) {
     return null;
   }
-  
-  return Math.max(...revisions.map((revision) => Number(revision.id)));
-}
+
+  return Math.max(...revisions.map(Number));
+}