@kumori/aurora-backend-handler 1.1.13 → 1.1.15

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,7 +458,7 @@ export const handleServiceOperationError = ({
 export const mapChannelsFromApiData = (
   apiData: any,
   entityId: string,
-  existingChannels?: { serverChannels: Channel[]; clientChannels: Channel[]; duplexChannels: Channel[] },
+  existingResources?: Resource[],
 ): {
   serverChannels: Channel[];
   clientChannels: Channel[];
@@ -486,12 +486,17 @@ export const mapChannelsFromApiData = (
   collectPublic(apiData.client);
   collectPublic(apiData.duplex);
 
-  const mapChannels = (section: any, target: Channel[], existing: Channel[] = []) => {
+  const mapChannels = (section: any, target: Channel[]) => {
     if (!section) return;
     Object.entries(section).forEach(
       ([channelName, channelData]: [string, any]) => {
         if (channelName.endsWith(inboundSuffix)) return;
-        const existingChannel = existing.find((ch) => ch.name === channelName);
+        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,
@@ -499,15 +504,15 @@ export const mapChannelsFromApiData = (
           protocol: channelData.protocol as "http" | "tcp" | "https",
           port: channelData.port,
           portNum: channelData.port,
-          isPublic: publicChannelNames.has(channelName) || existingChannel?.isPublic || false,
+          isPublic: publicChannelNames.has(channelName) || hasGatewayResource,
         });
       },
     );
   };
 
-  mapChannels(apiData.server, serverChannels, existingChannels?.serverChannels);
-  mapChannels(apiData.client, clientChannels, existingChannels?.clientChannels);
-  mapChannels(apiData.duplex, duplexChannels, existingChannels?.duplexChannels);
+  mapChannels(apiData.server, serverChannels);
+  mapChannels(apiData.client, clientChannels);
+  mapChannels(apiData.duplex, duplexChannels);
 
   return { serverChannels, clientChannels, duplexChannels };
 };

package/package.json

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

package/websocket-manager.ts

@@ -1274,11 +1274,7 @@ const handleOperationSuccess = (operation: PendingOperation, response: any) => {
           const channelsInfo = mapChannelsFromApiData(
             response.payload.data,
             serviceName,
-            { 
-              serverChannels: service.serverChannels, 
-              clientChannels: service.clientChannels, 
-              duplexChannels: service.duplexChannels 
-            }
+            service.resources, 
           );
           service.serverChannels = channelsInfo.serverChannels;
           service.clientChannels = channelsInfo.clientChannels;
@@ -1295,7 +1291,7 @@ const handleOperationSuccess = (operation: PendingOperation, response: any) => {
           svcSuccessResult.revisionData
         ) {
           try {
-            const updatedService = processRevisionData(
+            let updatedService = processRevisionData(
               svcSuccessResult.updatedService!,
               svcSuccessResult.revisionData,
               revisionsMap,
@@ -1315,6 +1311,28 @@ const handleOperationSuccess = (operation: PendingOperation, response: any) => {
               };
             }
 
+            const resources = updatedService.resources || [];
+            if (resources.length > 0) {
+              const applyIsPublic = (channels: Channel[]): Channel[] =>
+                channels.map((ch) => ({
+                  ...ch,
+                  isPublic:
+                    ch.isPublic ||
+                    resources.some(
+                      (r) =>
+                        (r.type === "port" || r.type === "domain") &&
+                        (r.name === `${ch.name}_port` || r.name === `${ch.name}_domain`),
+                    ),
+                }));
+      
+              updatedService = {
+                ...updatedService,
+                serverChannels: applyIsPublic(updatedService.serverChannels || []),
+                clientChannels: applyIsPublic(updatedService.clientChannels || []),
+                duplexChannels: applyIsPublic(updatedService.duplexChannels || []),
+              };
+            }
+      
             servicesMap.set(svcSuccessResult.serviceId, updatedService);
 
             if (updatedService.role && updatedService.role.length > 0) {