Merge branch 'cf-envoy-websockets' into 'master'

fix(ui): enable logs using websockets for CloudFormation installations

See merge request postgres-ai/database-lab!623

Author: agneum

packer/envoy.yaml

@@ -254,6 +254,8 @@ static_resources:
               "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
               codec_type: AUTO
               stat_prefix: ingress_http
+              upgrade_configs:
+                - upgrade_type: websocket
               route_config:
                 name: local_route
                 virtual_hosts:

ui/packages/ce/.env

@@ -1,2 +1,3 @@
 PORT=3001
 # REACT_APP_API_URL_PREFIX
+# REACT_APP_WS_URL_PREFIX

ui/packages/ce/Dockerfile

@@ -10,6 +10,9 @@ RUN npm ci -ws
 ARG API_URL_PREFIX
 ENV REACT_APP_API_URL_PREFIX ${API_URL_PREFIX}
 
+ARG WS_URL_PREFIX
+ENV REACT_APP_WS_URL_PREFIX ${WS_URL_PREFIX}
+
 RUN npm run build -w @postgres.ai/ce
 
 # Run phase.

ui/packages/ce/ci_docker_build_push.sh

@@ -24,7 +24,7 @@ for tag in "${ADDR[@]}"; do
 done
 
 set -x
-docker build --build-arg API_URL_PREFIX=/api $tags_build --file ./ui/packages/ce/Dockerfile .
+docker build --build-arg API_URL_PREFIX=/api --build-arg WS_URL_PREFIX=/ws $tags_build --file ./ui/packages/ce/Dockerfile .
 set +x
 
 echo -e "$tags_push" | while read -r tag; do

ui/packages/ce/src/api/engine/initWS.ts

@@ -1,7 +1,8 @@
 import { InitWS } from "@postgres.ai/shared/types/api/endpoints/initWS";
+import { WS_URL_PREFIX } from 'config/env'
 
 export const initWS: InitWS = (path: string, token: string): WebSocket => {
-    let url = new URL('/ws' + path, window.location.href);
+    let url = new URL(WS_URL_PREFIX + path, window.location.href);
     url.protocol = url.protocol.replace('http', 'ws');
     const wsAddr = url.href + '?token=' + token;
 

ui/packages/ce/src/config/env.ts

@@ -1,3 +1,4 @@
 export const NODE_ENV = process.env.NODE_ENV
 export const API_URL_PREFIX = process.env.REACT_APP_API_URL_PREFIX ?? ''
+export const WS_URL_PREFIX = process.env.REACT_APP_WS_URL_PREFIX ?? ''
 export const BUILD_TIMESTAMP = process.env.BUILD_TIMESTAMP

ui/packages/ce/src/react-app-env.d.ts

@@ -4,6 +4,7 @@
 declare namespace NodeJS {
   interface ProcessEnv {
     readonly REACT_APP_API_URL_PREFIX?: string
+    readonly REACT_APP_WS_URL_PREFIX?: string
     readonly BUILD_TIMESTAMP: number
   }
 }