@kumori/aurora-backend-handler 1.0.41 → 1.0.43

package/api/service-api-service.ts

@@ -15,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) {
@@ -32,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", " ");
@@ -47,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) {
@@ -80,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) {
@@ -110,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");
@@ -129,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) {
@@ -162,7 +162,7 @@ export const deleteService = async (data: Service, security: string) => {
       deleteBody,
       30000,
       "DELETE",
-      data.name
+      data.name,
     );
     return response;
   } catch (err) {
@@ -187,7 +187,7 @@ export const restartService = async (data: Service, security: string) => {
       restartBody,
       30000,
       "RESTART",
-      data.name
+      data.name,
     );
 
     const updatedService: Service = {
@@ -210,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;
@@ -290,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,
@@ -318,7 +324,7 @@ export const linkPendingServices = async (service: Service, token: string) => {
             linkBody,
             30000,
             "LINK",
-            service.name
+            service.name,
           );
 
           const notification: Notification = {
@@ -352,7 +358,7 @@ export const linkPendingServices = async (service: Service, token: string) => {
           };
           eventHelper.notification.publish.creation(notification);
         }
-      })
+      }),
     );
   }
 };
@@ -374,7 +380,7 @@ export const requestRevisionData = async (service: Service, token: string) => {
       "GET_REVISION",
       service.name,
       "service",
-      service
+      service,
     );
     return response;
   } catch (err) {
@@ -385,7 +391,7 @@ export const requestRevisionData = async (service: Service, token: string) => {
 export const updateService = async (
   data: Service,
   token: string,
-  scale?: number
+  scale?: number,
 ) => {
   try {
     await initializeGlobalWebSocketClient(token);
@@ -401,132 +407,184 @@ export const updateService = async (
     //   pendingLinks.set(data.name, newLinksToCreate);
     //   await linkPendingServices(serviceWithNewLinks, token);
     // }
-
-    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 url = new URL(
+      `${environment.apiServer.baseUrl}/api/${environment.apiServer.apiVersion}/tenant/${data.tenant}/service/${data.name}/revision/${data.currentRevision}`,
+    );
+    console.log('DEBUG data', data);
+    if (data.dsl) {
+      url.searchParams.append("dsl", "true");
     }
-
-    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 (data.serviceData) {
+      console.log('DEBUG - Updating service with bundle data, URL:', url.toString());
+      console.log('DEBUG - Service data to update:', data.serviceData);
+      const formData = new FormData();
+      console.log('DEBUG - FormData before appending:', 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", " ");
+      console.log('DEBUG - loaded FormData:', formData);
+      const response = await fetch(url.toString(), {
+        method: "POST",
+        body: formData,
       });
-    }
-
-    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;
+      console.log('DEBUG - Update service response:', response);
+      if (!response.ok) {
+        throw new Error(`HTTP error! status: ${response.status}`);
       }
-    }
-    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,
-        };
-      });
+      const jsonResponse = await response.json();
+      console.log('DEBUG - Update service JSON response:', jsonResponse);
+      const isTimeout = jsonResponse?.events?.some(
+        (event: any) => event.content === "_timeout_",
+      );
+
+      if (isTimeout) {
+        console.error("Timeout en la petición:", {
+          isOk: false,
+          code: "TIMEOUT",
+          error: "_timeout_",
+        });
+      }
     } 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 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 updateBody = {
-      spec: {
-        type: "update-config",
-        comment: "Service configuration update",
-        config: {
-          parameter: parameterObject,
-          resource: resourceObject,
-          resilience: 0,
-          scale: scaleConfig,
+      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}`,
+            };
+          }
+        });
+      }
+
+      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>,
+            ) || {},
         },
-        meta: meta,
-      },
-      tenant: data.tenant,
-      service: data.name,
-      previous: previousRevision,
-    };
+      };
 
-    const response = await makeGlobalWebSocketRequest(
-      "revision:update_revision",
-      updateBody,
-      30000,
-      "UPDATE_CONFIG",
-      data.name
-    );
+      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 updatedService: Service = {
       ...data,
@@ -577,7 +635,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(
@@ -592,7 +650,7 @@ export const unlinkServices = async (service: Service, token: string) => {
             unlinkBody,
             30000,
             "UNLINK",
-            service.name
+            service.name,
           );
 
           const unlinkNotification: Notification = {
@@ -628,7 +686,7 @@ export const unlinkServices = async (service: Service, token: string) => {
           };
           eventHelper.notification.publish.creation(notification);
         }
-      })
+      }),
     );
   }
 };
@@ -653,7 +711,7 @@ export const updateServiceLinks = async (link: Link, token: string) => {
         linkBody,
         30000,
         "UNLINK",
-        link.origin
+        link.origin,
       );
 
       // const unlinkNotification: Notification = {
@@ -699,7 +757,7 @@ export const updateServiceLinks = async (link: Link, token: string) => {
         linkBody,
         30000,
         "LINK",
-        link.origin
+        link.origin,
       );
 
       const notification: Notification = {
@@ -755,7 +813,7 @@ export const changeRevision = async (data: Service, token: string) => {
       revisionBody,
       30000,
       "UPDATE_REVISION",
-      data.name
+      data.name,
     );
     const notification: Notification = {
       type: "success",
@@ -791,6 +849,6 @@ function getLatestRevision(revisions: string[]): number | null {
   if (!revisions || revisions.length === 0) {
     return null;
   }
-  
+
   return Math.max(...revisions.map(Number));
-}
+}

package/helpers/revision-helper.ts

@@ -253,25 +253,21 @@ const updateServiceWithRevision = (
   const existingRevisionIndex = existingService.revisions.findIndex(
     (rev) => rev === entityId,
   );
-  const shouldIncludeInList =
-    newRevision.errorCode !== "COMPUTE_ERROR" &&
-    eventData.status?.error?.code !== "COMPUTE_ERROR";
-
-  let updatedRevisions;
-  if (shouldIncludeInList) {
-    updatedRevisions =
-      existingRevisionIndex === -1
-        ? [...existingService.revisions, entityId]
-        : existingService.revisions;
-  } else {
-    updatedRevisions = existingService.revisions.filter(
-      (rev) => rev !== entityId,
-    );
-  }
+  const updatedRevisions =
+    existingRevisionIndex === -1
+      ? [...existingService.revisions, entityId]
+      : existingService.revisions;
+  const currentRevisionTimestamp = Number(existingService.currentRevision) || 0;
+  const incomingRevisionTimestamp = Number(entityId) || 0;
+  const updatedCurrentRevision =
+    incomingRevisionTimestamp > currentRevisionTimestamp
+      ? entityId
+      : existingService.currentRevision;
 
   const updatedService: Service = {
     ...existingService,
     revisions: updatedRevisions,
+    currentRevision: updatedCurrentRevision,
     role: roles.length > 0 ? roles : existingService.role,
     usage: newRevision.usage,
     startedAt: newRevision.createdAt || existingService.startedAt,

package/package.json

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