wip rebase

Author: tjholm

pkg/cloud/cloud.go

@@ -321,7 +321,7 @@ func New(projectName string, opts LocalCloudOptions) (*LocalCloud, error) {
 		return nil, err
 	}
 
-	localWebsites := websites.NewLocalWebsitesService(localGateway.GetApiAddress, opts.LocalCloudMode == StartMode)
+	localWebsites := websites.NewLocalWebsitesService(localGateway.GetApiAddress, localGateway.GetWebsocketAddress, opts.LocalCloudMode == StartMode)
 
 	return &LocalCloud{
 		servers:    make(map[string]*server.NitricServer),

pkg/cloud/gateway/gateway.go

@@ -46,7 +46,6 @@ import (
 	"github.com/nitrictech/cli/pkg/netx"
 	"github.com/nitrictech/cli/pkg/project/localconfig"
 	"github.com/nitrictech/cli/pkg/system"
-	"github.com/nitrictech/cli/pkg/view/tui"
 
 	base_http "github.com/nitrictech/nitric/cloud/common/runtime/gateway"
 
@@ -157,6 +156,19 @@ func (s *LocalGatewayService) GetApiAddress(apiName string) string {
 	return ""
 }
 
+func (s *LocalGatewayService) GetWebsocketAddress(socketName string) string {
+	s.lock.RLock()
+	defer s.lock.RUnlock()
+
+	addresses := s.GetWebsocketAddresses()
+
+	if address, ok := addresses[socketName]; ok {
+		return address
+	}
+
+	return ""
+}
+
 func (s *LocalGatewayService) GetHttpWorkerAddresses() map[string]string {
 	s.lock.RLock()
 	defer s.lock.RUnlock()
@@ -349,14 +361,14 @@ func (s *LocalGatewayService) handleWebsocketRequest(socketName string) func(ctx
 					SocketName:   socketName,
 				})
 				if err != nil {
-					tui.Error.Println(err.Error())
+					system.Logf("Websocket error: %s", err.Error())
 					return
 				}
 			}()
 
 			err = s.websocketPlugin.RegisterConnection(socketName, connectionId, ws)
 			if err != nil {
-				tui.Error.Println(err.Error())
+				system.Logf("Websocket error: %s", err.Error())
 				return
 			}
 
@@ -372,7 +384,7 @@ func (s *LocalGatewayService) handleWebsocketRequest(socketName string) func(ctx
 				if err != nil && websocket.IsCloseError(err, 1001, 1005) {
 					break
 				} else if err != nil {
-					log.Println("read:", err)
+					system.Logf("websocket read error: %v", err)
 					break
 				}
 
@@ -390,7 +402,7 @@ func (s *LocalGatewayService) handleWebsocketRequest(socketName string) func(ctx
 					},
 				})
 				if err != nil {
-					tui.Error.Println(err.Error())
+					system.Logf("Websocket error: %s", err.Error())
 					return
 				}
 			}
@@ -407,13 +419,13 @@ func (s *LocalGatewayService) handleWebsocketRequest(socketName string) func(ctx
 				},
 			})
 			if err != nil {
-				tui.Error.Println(err.Error())
+				system.Logf("Websocket error: %s", err.Error())
 				return
 			}
 		})
 		if err != nil {
 			if _, ok := err.(websocket.HandshakeError); ok {
-				tui.Error.Println(err.Error())
+				system.Logf("Websocket error: %s", err.Error())
 			}
 
 			return

pkg/dashboard/frontend/src/lib/utils/generate-architecture-data.ts

@@ -609,6 +609,23 @@ export function generateArchitectureData(data: WebSocketResponse): {
         label: `Rewrites to /api/${api.name}`,
       })
     })
+
+    data.websockets.forEach((websocket) => {
+      edges.push({
+        id: `e-${websocket.name}-websites`,
+        source: websitesNode.id,
+        target: `websocket-${websocket.name}`,
+        animated: true,
+        markerEnd: {
+          type: MarkerType.ArrowClosed,
+        },
+        markerStart: {
+          type: MarkerType.ArrowClosed,
+          orient: 'auto-start-reverse',
+        },
+        label: `Rewrites to /ws/${websocket.name}`,
+      })
+    })
   }
 
   data.services.forEach((service) => {