@kumori/aurora-backend-handler 1.0.75 → 1.0.77

package/api/service-api-service.ts

@@ -209,100 +209,123 @@ 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
-  );
-
-  let linkBody;
-  if (originInClient) {
-    linkBody = {
-      client_tenant: data.tenant,
-      client_service: data.name,
-      client_channel: link.originChannel,
-      server_tenant: data.tenant,
-      server_service: link.target,
-      server_channel: link.targetChannel,
-    };
-  } else if (targetInClient) {
-    linkBody = {
-      client_tenant: data.tenant,
-      client_service: data.name,
-      client_channel: link.targetChannel,
-      server_tenant: data.tenant,
-      server_service: link.origin,
-      server_channel: link.originChannel,
-    };
-  } else if (originInServer) {
-    linkBody = {
-      client_tenant: data.tenant,
-      client_service: link.target,
-      client_channel: link.targetChannel,
-      server_tenant: data.tenant,
-      server_service: data.name,
-      server_channel: link.originChannel,
-    };
-  } else if (targetInServer) {
-    linkBody = {
-      client_tenant: data.tenant,
-      client_service: link.origin,
-      client_channel: link.originChannel,
-      server_tenant: data.tenant,
-      server_service: data.name,
-      server_channel: link.targetChannel,
-    };
-  } else if (originInDuplex) {
-    linkBody = {
-      client_tenant: data.tenant,
-      client_service: link.target,
-      client_channel: link.targetChannel,
-      server_tenant: data.tenant,
-      server_service: data.name,
-      server_channel: link.originChannel,
-    };
-  } else if (targetInDuplex) {
-    linkBody = {
-      client_tenant: data.tenant,
-      client_service: link.origin,
-      client_channel: link.originChannel,
-      server_tenant: data.tenant,
-      server_service: data.name,
-      server_channel: link.targetChannel,
-    };
-  } else {
-    console.warn(
-      `No se encontraron canales para el enlace: origin=${link.origin}, target=${link.target}`
-    );
-    linkBody = {
-      client_tenant: data.tenant,
-      client_service: link.origin,
-      client_channel: link.originChannel,
-      server_tenant: data.tenant,
-      server_service: link.target,
-      server_channel: link.targetChannel,
-    };
-  }
-  return linkBody;
+  const generateLinkBody = (data: Service, link: Link) => {
+    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) {
+      linkBody = {
+        client_tenant: data.tenant,
+        client_service: data.name,
+        client_channel: link.originChannel,
+        server_tenant: data.tenant,
+        server_service: link.target,
+        server_channel: link.targetChannel,
+      };
+    } else if (targetInClient) {
+      linkBody = {
+        client_tenant: data.tenant,
+        client_service: data.name,
+        client_channel: link.targetChannel,
+        server_tenant: data.tenant,
+        server_service: link.origin,
+        server_channel: link.originChannel,
+      };
+    } else if (originInServer) {
+      linkBody = {
+        client_tenant: data.tenant,
+        client_service: link.target,
+        client_channel: link.targetChannel,
+        server_tenant: data.tenant,
+        server_service: data.name,
+        server_channel: link.originChannel,
+      };
+    } else if (targetInServer) {
+      linkBody = {
+        client_tenant: data.tenant,
+        client_service: link.origin,
+        client_channel: link.originChannel,
+        server_tenant: data.tenant,
+        server_service: data.name,
+        server_channel: link.targetChannel,
+      };
+    } else if (originInDuplex) {
+      linkBody = {
+        client_tenant: data.tenant,
+        client_service: link.target,
+        client_channel: link.targetChannel,
+        server_tenant: data.tenant,
+        server_service: data.name,
+        server_channel: link.originChannel,
+      };
+    } else if (targetInDuplex) {
+      linkBody = {
+        client_tenant: data.tenant,
+        client_service: link.origin,
+        client_channel: link.originChannel,
+        server_tenant: data.tenant,
+        server_service: data.name,
+        server_channel: link.targetChannel,
+      };
+    } else {
+      console.warn(
+        `No se encontraron canales para el enlace: origin=${link.origin}, target=${link.target}`,
+      );
+      linkBody = {
+        client_tenant: data.tenant,
+        client_service: link.origin,
+        client_channel: link.originChannel,
+        server_tenant: data.tenant,
+        server_service: link.target,
+        server_channel: link.targetChannel,
+      };
+    }
+    return linkBody;
+  };
 };
 export const linkPendingServices = async (service: Service, token: string) => {
   const links = pendingLinks.get(service.name);
@@ -582,7 +605,7 @@ export const updateService = async (
         },
       };
       eventHelper.service.publish.updated(updatedService);
-  
+
       const updateNotification: Notification = {
         type: "success",
         subtype: "service-updated",
@@ -594,11 +617,10 @@ export const updateService = async (
           tenant: data.tenant,
         },
       };
-  
+
       eventHelper.notification.publish.creation(updateNotification);
       return response;
     }
-
   } catch (err) {
     console.error("Error updating service configuration via WebSocket:", err);
     const notification: Notification = {
@@ -837,10 +859,15 @@ function getLatestRevision(revisions: Revision[]): number | null {
   if (!revisions || revisions.length === 0) {
     return null;
   }
-  
+
   return Math.max(...revisions.map((revision) => Number(revision.id)));
 }
-export async function restartInstance(service: Service, roleId: string, instanceId: string, token: string) {
+export async function restartInstance(
+  service: Service,
+  roleId: string,
+  instanceId: string,
+  token: string,
+) {
   try {
     await initializeGlobalWebSocketClient(token);
     const status = getWebSocketStatus();
@@ -855,7 +882,7 @@ export async function restartInstance(service: Service, roleId: string, instance
       revisionBody,
       30000,
       "RESTART_INSTANCE",
-      service.name
+      service.name,
     );
     const notification: Notification = {
       type: "success",

package/package.json

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