@kumori/aurora-backend-handler 1.0.46 → 1.0.48

package/api/account-api-service.ts

@@ -613,7 +613,7 @@ export const deleteAccount = async (account: Account, security: Security) => {
           credentials: {
             username: account.cloudProvider.username,
             password: account.cloudProvider.password,
-            project_id: account.cloudProvider.project_id || "",
+            project_id: account.cloudProvider?.project_id || "",
           },
         },
       };
@@ -628,7 +628,7 @@ 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 || "",
+            project_id: account.cloudProvider?.project_id || "",
           },
         },
       };

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 = {
@@ -211,27 +210,33 @@ 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
+      channel.name === link.originChannel ||
+      channel.from === link.originChannel,
   );
   const originInServer = data.serverChannels.find(
     (channel) =>
-      channel.name === link.originChannel || channel.from === link.originChannel
+      channel.name === link.originChannel ||
+      channel.from === link.originChannel,
   );
   const originInDuplex = data.duplexChannels.find(
     (channel) =>
-      channel.name === link.originChannel || channel.from === link.originChannel
+      channel.name === link.originChannel ||
+      channel.from === link.originChannel,
   );
   const targetInClient = data.clientChannels.find(
     (channel) =>
-      channel.name === link.targetChannel || channel.from === link.targetChannel
+      channel.name === link.targetChannel ||
+      channel.from === link.targetChannel,
   );
   const targetInServer = data.serverChannels.find(
     (channel) =>
-      channel.name === link.targetChannel || channel.from === link.targetChannel
+      channel.name === link.targetChannel ||
+      channel.from === link.targetChannel,
   );
   const targetInDuplex = data.duplexChannels.find(
     (channel) =>
-      channel.name === link.targetChannel || channel.from === link.targetChannel
+      channel.name === link.targetChannel ||
+      channel.from === link.targetChannel,
   );
 
   let linkBody;
@@ -291,7 +296,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,
@@ -319,7 +324,7 @@ export const linkPendingServices = async (service: Service, token: string) => {
             linkBody,
             30000,
             "LINK",
-            service.name
+            service.name,
           );
 
           const notification: Notification = {
@@ -353,7 +358,7 @@ export const linkPendingServices = async (service: Service, token: string) => {
           };
           eventHelper.notification.publish.creation(notification);
         }
-      })
+      }),
     );
   }
 };
@@ -375,7 +380,7 @@ export const requestRevisionData = async (service: Service, token: string) => {
       "GET_REVISION",
       service.name,
       "service",
-      service
+      service,
     );
     return response;
   } catch (err) {
@@ -572,33 +577,33 @@ export const updateService = async (
         "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 +628,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 +643,7 @@ export const unlinkServices = async (service: Service, token: string) => {
             unlinkBody,
             30000,
             "UNLINK",
-            service.name
+            service.name,
           );
 
           const unlinkNotification: Notification = {
@@ -674,7 +679,7 @@ export const unlinkServices = async (service: Service, token: string) => {
           };
           eventHelper.notification.publish.creation(notification);
         }
-      })
+      }),
     );
   }
 };
@@ -699,7 +704,7 @@ export const updateServiceLinks = async (link: Link, token: string) => {
         linkBody,
         30000,
         "UNLINK",
-        link.origin
+        link.origin,
       );
 
       // const unlinkNotification: Notification = {
@@ -745,7 +750,7 @@ export const updateServiceLinks = async (link: Link, token: string) => {
         linkBody,
         30000,
         "LINK",
-        link.origin
+        link.origin,
       );
 
       const notification: Notification = {
@@ -801,7 +806,7 @@ export const changeRevision = async (data: Service, token: string) => {
       revisionBody,
       30000,
       "UPDATE_REVISION",
-      data.name
+      data.name,
     );
     const notification: Notification = {
       type: "success",
@@ -833,10 +838,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));
+}