@kumori/aurora-backend-handler 1.1.12 → 1.1.14

package/api/deploy-service-helper.ts

@@ -436,10 +436,6 @@ export function handleParametersToGenerateData(
  * @returns A ServiceSpecForm object with the data of the service.
  */
 export function transformServiceToForm(service: Service): ServiceSpecForm {
-  console.log(
-    "DEBUG - transformServiceToForm (channels)",
-    service.serverChannels,
-  );
   return {
     tenantId: service.tenant,
     accountId: service.account,

package/api/service-api-service.ts

@@ -14,7 +14,6 @@ let pendingLinks = new Map<string, Link[]>();
  * @param data Service object with the data of the service
  */
 export const deployService = async (data: Service, token: string) => {
-  console.log("DEBUG - deployService", data);
   try {
     const url = new URL(
       `${environment.apiServer.baseUrl}/api/${environment.apiServer.apiVersion}/tenant/${data.tenant}/service/${data.name}`,

package/helpers/service-helper.ts

@@ -1,4 +1,4 @@
-import { Channel, Service, Tenant, Usage } from "@kumori/aurora-interfaces";
+import { Channel, Resource, Service, Tenant, Usage } from "@kumori/aurora-interfaces";
 import { Revision } from "@kumori/aurora-interfaces/interfaces/revision-interface";
 import { getTimestamp } from "../utils/utils";
 
@@ -458,6 +458,7 @@ export const handleServiceOperationError = ({
 export const mapChannelsFromApiData = (
   apiData: any,
   entityId: string,
+  existingResources?: Resource[],
 ): {
   serverChannels: Channel[];
   clientChannels: Channel[];
@@ -467,7 +468,6 @@ export const mapChannelsFromApiData = (
   const clientChannels: Channel[] = [];
   const duplexChannels: Channel[] = [];
   const inboundSuffix = "_inbound.inbound";
-
   const publicChannelNames = new Set<string>();
 
   const collectPublic = (section: any) => {
@@ -491,6 +491,12 @@ export const mapChannelsFromApiData = (
     Object.entries(section).forEach(
       ([channelName, channelData]: [string, any]) => {
         if (channelName.endsWith(inboundSuffix)) return;
+        const hasGatewayResource = existingResources?.some(
+          (r) =>
+            (r.type === "port" || r.type === "domain") &&
+            (r.name === `${channelName}_port` || r.name === `${channelName}_domain`),
+        ) ?? false;
+
         target.push({
           name: channelName,
           from: entityId,
@@ -498,7 +504,7 @@ export const mapChannelsFromApiData = (
           protocol: channelData.protocol as "http" | "tcp" | "https",
           port: channelData.port,
           portNum: channelData.port,
-          isPublic: publicChannelNames.has(channelName),
+          isPublic: publicChannelNames.has(channelName) || hasGatewayResource,
         });
       },
     );
@@ -509,4 +515,4 @@ export const mapChannelsFromApiData = (
   mapChannels(apiData.duplex, duplexChannels);
 
   return { serverChannels, clientChannels, duplexChannels };
-};
+};

package/package.json

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

package/websocket-manager.ts

@@ -1274,6 +1274,7 @@ const handleOperationSuccess = (operation: PendingOperation, response: any) => {
           const channelsInfo = mapChannelsFromApiData(
             response.payload.data,
             serviceName,
+            service.resources, 
           );
           service.serverChannels = channelsInfo.serverChannels;
           service.clientChannels = channelsInfo.clientChannels;