fixed issue with websocket callback location configuration

Author: Klaven

Dockerfile

@@ -7,8 +7,6 @@ WORKDIR /usr/src/app
 COPY . .
 RUN cargo build --bin monolith --release
 
-
-
 # Build the chiselled filesystem based on the desired slices.
 FROM ubuntu:$UBUNTU_RELEASE AS chiselled
 ARG UBUNTU_RELEASE
@@ -18,23 +16,26 @@ ARG TARGETARCH
 ADD https://github.com/canonical/chisel/releases/download/v0.9.1/chisel_v0.9.1_linux_$TARGETARCH.tar.gz chisel.tar.gz
 RUN tar -xvf chisel.tar.gz -C /usr/bin/
 RUN apt-get update \
-   && DEBIAN_FRONTEND=noninteractive apt-get install -y ca-certificates 
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y ca-certificates
 
 WORKDIR /rootfs
 
+#RUN chisel cut --release ubuntu-$UBUNTU_RELEASE --root /rootfs \
+#    base-files_base \
+#    base-files_release-info \
+#    ca-certificates_data \
+#    libgcc-s1_libs \
+#    libc6_libs \
+#    libssl3_libs \
+#    openssl_bins
 
-RUN chisel cut --release ubuntu-$UBUNTU_RELEASE --root /rootfs \
-   base-files_base \
-   base-files_release-info \
-   ca-certificates_data \
-   libgcc-s1_libs \
-   libc6_libs \
-   libssl3_libs \
-   openssl_bins
+FROM ubuntu:22.04
+RUN apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y ca-certificates
 
-FROM scratch
 COPY ./ai_manager_service/migrations /var/lib/db/migrations
 EXPOSE 9000
-COPY --from=chiselled /rootfs /
+# COPY --from=chiselled /rootfs /
 COPY --from=builder /usr/src/app/target/release/monolith /usr/local/bin/twitch-alerts
+COPY ./frontend_api/assets /var/lib/assets/
 CMD ["/usr/local/bin/twitch-alerts"]

deployment/twitch-alerts-deployment.yaml

@@ -18,102 +18,116 @@ spec:
       labels:
         app: twitch-alerts
     spec:
-
       # The config map is used to pass in our Litestream configuration file.
       volumes:
-      - name: configmap
-        configMap:
-          name: litestream
-      - name: data
-        emptyDir:
-          sizeLimit: 5G
-          
+        - name: configmap
+          configMap:
+            name: litestream
+        - name: data
+          emptyDir:
+            sizeLimit: 5G
 
       # Initialize using Litestream to restore data automatically
       # before starting the application.
       initContainers:
-      - name: init-litestream
-        image: litestream/litestream:0.3.6
-        args: ['restore','-config','/etc/config/litestream.yaml', '-if-db-not-exists', '-if-replica-exists', '-v', '/var/lib/twitch-alerts/db']
-        volumeMounts:
-        - name: data
-          mountPath: /var/lib/twitch-alerts
-        - name: configmap
-          mountPath: /etc/config
-        env:
-        - name: LITESTREAM_ACCESS_KEY_ID
-          valueFrom:
-            secretKeyRef:
-              name: litestream
-              key: LITESTREAM_ACCESS_KEY_ID
-        - name: LITESTREAM_SECRET_ACCESS_KEY
-          valueFrom:
-            secretKeyRef:
-              name: litestream
-              key: LITESTREAM_SECRET_ACCESS_KEY
+        - name: init-litestream
+          image: litestream/litestream:0.3.6
+          args:
+            [
+              "restore",
+              "-config",
+              "/etc/config/litestream.yaml",
+              "-if-db-not-exists",
+              "-if-replica-exists",
+              "-v",
+              "/var/lib/twitch-alerts/db",
+            ]
+          volumeMounts:
+            - name: data
+              mountPath: /var/lib/twitch-alerts
+            - name: configmap
+              mountPath: /etc/config
+          env:
+            - name: LITESTREAM_ACCESS_KEY_ID
+              valueFrom:
+                secretKeyRef:
+                  name: litestream
+                  key: LITESTREAM_ACCESS_KEY_ID
+            - name: LITESTREAM_SECRET_ACCESS_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: litestream
+                  key: LITESTREAM_SECRET_ACCESS_KEY
 
       # Start your application & Litestream to share a PVC data directory.
       containers:
-      - name: twitch-alerts
-        image: nullchannel/twitch-alerts:0.1.24
-        ports:
-        - name: websocket
-          containerPort: 9000
-        volumeMounts:
-        - name: data
-          mountPath: /var/lib/twitch-alerts
-        env:
-        - name: GPT_KEY
-          valueFrom:
-            secretKeyRef:
-              name: twitch-alerts-secret
-              key: GPT_KEY
-        - name: ACCESS_TOKEN
-          valueFrom:
-            secretKeyRef:
-              name: twitch-alerts-secret
-              key: ACCESS_TOKEN
-        - name: CHANNEL_ID
-          valueFrom:
-            secretKeyRef:
-              name: twitch-alerts-secret
-              key: CHANNEL_ID
-        - name: DB_PATH
-          valueFrom:
-            secretKeyRef:
-              name: twitch-alerts-secret
-              key: DB_PATH
-        - name: ENV
-          valueFrom:
-            secretKeyRef:
-              name: twitch-alerts-secret
-              key: ENV
-        - name: AI_MIGRATIONS_DIR
-          valueFrom:
-            secretKeyRef:
-              name: twitch-alerts-secret
-              key: AI_MIGRATIONS_DIR
-
-      - name: litestream
-        image: litestream/litestream:0.3.6
-        args: ['replicate','-config','/etc/config/litestream.yaml',]
-        volumeMounts:
-        - name: data
-          mountPath: /var/lib/twitch-alerts
-        - name: configmap
-          mountPath: /etc/config
-        env:
-        - name: LITESTREAM_ACCESS_KEY_ID
-          valueFrom:
-            secretKeyRef:
-              name: litestream
-              key: LITESTREAM_ACCESS_KEY_ID
-        - name: LITESTREAM_SECRET_ACCESS_KEY
-          valueFrom:
-            secretKeyRef:
-              name: litestream
-              key: LITESTREAM_SECRET_ACCESS_KEY
-        ports:
-        - name: metrics
-          containerPort: 9090
+        - name: twitch-alerts
+          image: nullchannel/twitch-alerts:0.1.35
+          ports:
+            - name: httpport
+              containerPort: 8080
+            - name: websocket
+              containerPort: 9000
+          volumeMounts:
+            - name: data
+              mountPath: /var/lib/twitch-alerts
+          env:
+            - name: FRONTEND_ASSETS
+              value: "/var/lib/assets"
+            - name: HTTP_PORT
+              value: "8080"
+            - name: WEBSOCKET_HOST
+              value: "10.1.1.53"
+            - name: GPT_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: twitch-alerts-secret
+                  key: GPT_KEY
+            - name: ACCESS_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: twitch-alerts-secret
+                  key: ACCESS_TOKEN
+            - name: CHANNEL_ID
+              valueFrom:
+                secretKeyRef:
+                  name: twitch-alerts-secret
+                  key: CHANNEL_ID
+            - name: DB_PATH
+              valueFrom:
+                secretKeyRef:
+                  name: twitch-alerts-secret
+                  key: DB_PATH
+            - name: ENV
+              valueFrom:
+                secretKeyRef:
+                  name: twitch-alerts-secret
+                  key: ENV
+            - name: AI_MIGRATIONS_DIR
+              valueFrom:
+                secretKeyRef:
+                  name: twitch-alerts-secret
+                  key: AI_MIGRATIONS_DIR
 
+        - name: litestream
+          image: litestream/litestream:0.3.6
+          args: ["replicate", "-config", "/etc/config/litestream.yaml"]
+          volumeMounts:
+            - name: data
+              mountPath: /var/lib/twitch-alerts
+            - name: configmap
+              mountPath: /etc/config
+          env:
+            - name: LITESTREAM_ACCESS_KEY_ID
+              valueFrom:
+                secretKeyRef:
+                  name: litestream
+                  key: LITESTREAM_ACCESS_KEY_ID
+            - name: LITESTREAM_SECRET_ACCESS_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: litestream
+                  key: LITESTREAM_SECRET_ACCESS_KEY
+          ports:
+            - name: metrics
+              containerPort: 9090

deployment/twitch-alerts-lb.yaml

@@ -13,5 +13,5 @@ spec:
     name: websocket
   - protocol: TCP
     port: 80
-    targetPort: 80
+    targetPort: 8080
     name: frontend

frontend_api/src/lib.rs

@@ -1,5 +1,6 @@
 use axum::{routing::get, Router};
 use futures_channel::mpsc::unbounded;
+use futures_util::sink::With;
 use futures_util::{SinkExt, StreamExt};
 use maud::html;
 use messages::DisplayMessage;
@@ -8,6 +9,7 @@ use std::{
     collections::HashMap,
     sync::{Arc, Mutex},
 };
+
 use tokio::{
     net::{TcpListener, TcpStream},
     sync::mpsc,
@@ -27,17 +29,42 @@ use routes::{admin, index};
 use crate::types::{ConnectionMap, EventQueues, Queues};
 
 pub struct FrontendApi {
-    ws_address: String,
-    http_address: String,
-    connection_state: ConnectionMap,
-    asset_path: String,
+    pub host_info: HostInfo,
+    pub connection_state: ConnectionMap,
+    pub asset_path: String,
+}
+
+#[derive(Clone)]
+pub struct HostInfo {
+    pub websocket_host: String,
+    pub ws_port: u16,
+    pub http_port: u16,
+}
+
+impl HostInfo {
+    pub fn get_http_address(&self) -> String {
+        format!("{}:{}", "0.0.0.0", self.http_port)
+    }
+
+    pub fn get_ws_address(&self) -> String {
+        format!("{}:{}", "0.0.0.0", self.ws_port)
+    }
+
+    pub fn get_frontend_ws_address(&self) -> String {
+        format!("{}:{}", self.websocket_host, self.ws_port)
+    }
+}
+
+#[derive(Clone)]
+pub struct UnitedStates {
+    pub host_info: HostInfo,
+    pub event_queues: EventQueues,
 }
 
 impl FrontendApi {
-    pub fn new(ws_address: String, http_address: String, asset_path: String) -> FrontendApi {
+    pub fn new(host_info: HostInfo, asset_path: String) -> FrontendApi {
         FrontendApi {
-            ws_address,
-            http_address,
+            host_info,
             connection_state: ConnectionMap::new(Mutex::new(HashMap::new())),
             asset_path,
         }
@@ -47,10 +74,10 @@ impl FrontendApi {
         &self,
         mut receiver: mpsc::UnboundedReceiver<DisplayMessage>,
     ) -> Result<(), eyre::Error> {
-        let listener = TcpListener::bind(&self.ws_address)
+        let listener = TcpListener::bind(&self.host_info.get_ws_address())
             .await
             .expect("Can't listen");
-        println!("Listening on: {}", self.ws_address);
+        println!("Listening on: {}", self.host_info.get_ws_address());
 
         let connection_state = self.connection_state.clone();
         let message_queue_arc: EventQueues = Arc::new(Mutex::new(Queues::new()));
@@ -139,9 +166,14 @@ impl FrontendApi {
             }
         });
 
-        let https_address = self.http_address.clone();
+        let https_address = self.host_info.get_http_address();
+
+        let united_states = UnitedStates {
+            host_info: self.host_info.clone(),
+            event_queues: message_queue_arc.clone(),
+        };
+
         print!("Frontend HTTP is Listening on: {}", https_address);
-        let event_queues = message_queue_arc.clone();
         let asset_path = self.asset_path.clone();
         tokio::spawn(async move {
             let listener = TcpListener::bind(&https_address)
@@ -160,7 +192,7 @@ impl FrontendApi {
                 //TODO: understand where to put our assets
                 // Remember that these need served by nginx in production
                 .nest_service("/assets", ServeDir::new(asset_path.clone()))
-                .with_state(event_queues.clone());
+                .with_state(united_states.clone());
 
             // run it
             axum::serve(listener, app).await.unwrap();