Fix collab bug

Author: DistractedCat

kubernetes/collab-service-service.yaml

@@ -9,5 +9,5 @@ spec:
     - protocol: TCP
       port: 4000
       targetPort: 4000
-      nodePort: 31000
-  type: NodePort
+      #nodePort: 31000
+  type: ClusterIP

kubernetes/matching-service-api-deployment.yaml

@@ -14,7 +14,7 @@ spec:
       containers:
         - name: matching-service-api
           image: distractedcat/matching-service-api:1.0.0
-          imagePullPolicy: IfNotPresent
+          imagePullPolicy: Always
           env:
             - name: PORT
               value: :9200

kubernetes/matching-service-deployment.yaml

@@ -14,7 +14,7 @@ spec:
       containers:
         - name: matching-service
           image: distractedcat/matching-service:1.0.0
-          imagePullPolicy: IfNotPresent
+          imagePullPolicy: Always
           env:
             - name: RABBIT_URI
               value: amqp://grp14:grp14@rabbitmq/

kubernetes/nginx-deployment.yaml

@@ -15,5 +15,6 @@ spec:
       containers:
       - name: nginx
         image: distractedcat/nginx:1.0.0 
+        imagePullPolicy: Always
         ports:
         - containerPort: 80

kubernetes/peerprep-deployment.yaml

@@ -27,7 +27,7 @@ spec:
             - name: NEXT_PUBLIC_NGINX
               value: http://nginx:80
             - name: NEXT_PUBLIC_COLLAB
-              value: ws://127.0.0.1/37919
+              value: collab
             - name: DEV_ENV
               value: not
           ports:

matching-service-api/models/producer_queue.go

@@ -2,6 +2,8 @@ package models
 
 import (
 	rabbit "github.com/streadway/amqp"
+	"log"
+	"time"
 )
 
 type ProducerQueue struct {
@@ -12,13 +14,22 @@ type ProducerQueue struct {
 }
 
 func InitialiseQueue(URI string) (*ProducerQueue, error) {
-	connection, err := rabbit.Dial(URI)
+	var connection *rabbit.Connection
+	var err error
+
+	for i := 0; i < 10; i++ {
+		connection, err = rabbit.Dial(URI)
+		if err == nil {
+			break
+		}
+		log.Printf("Could not establish connection to RabbitMQ, retrying in 5 seconds... (%d/10)\n", i+1)
+		time.Sleep(5 * time.Second)
+	}
 
 	if err != nil {
 		return nil, err
 	}
 
-
 	channel, err := connection.Channel()
 
 	if err != nil {

matching-service/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"log"
 	"os"
+	"time"
 
 	"matching-service/consumer"
 	models "matching-service/models"
@@ -57,15 +58,23 @@ func main() {
 		log.Fatal("No Rabbit URI found in environment variables")
 	}
 
-	connection, err := rabbit.Dial(URI)
-	
+	var connection *rabbit.Connection
+	var err error
+
+	for i := 0; i < 10; i++ {
+		connection, err = rabbit.Dial(URI)
+		if err == nil {
+			break
+		}
+		log.Printf("Could not establish connection to RabbitMQ, retrying in 5 seconds... (%d/10)\n", i+1)
+		time.Sleep(5 * time.Second)
+	}
+
 	if err != nil {
-		log.Fatal("Could not establish connection to RabbitMQ" + err.Error())
+		log.Fatal("Could not establish connection to RabbitMQ after 10 attempts: " + err.Error())
 	}
 
 	defer connection.Close()
-	
-
 
 	channel, err := connection.Channel()
 

nginx/nginx.conf

@@ -40,9 +40,9 @@ http {
         server storage-blob-api:9300;
     }
 
-    # upstream collab {
-    #     server collab:4000;
-    # }
+    upstream collab {
+        server collab:4000;
+    }
 
     server {
         listen 80;
@@ -52,6 +52,9 @@ http {
             proxy_set_header   X-Real-IP          $remote_addr;
             proxy_set_header   X-Forwarded-Proto  $scheme;
             proxy_set_header   X-Forwarded-For    $proxy_add_x_forwarded_for;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
         }
 
         location /users/ {
@@ -71,8 +74,16 @@ http {
             proxy_pass http://storage_blob_api/;
         }
 
-        # location /collab/ {
-        #     proxy_pass http://collab/;
-        # }
+        location /collab/ {
+            proxy_pass http://collab/;
+            proxy_set_header   Host               $host;
+            proxy_set_header   X-Real-IP          $remote_addr;
+            proxy_set_header   X-Forwarded-Proto  $scheme;
+            proxy_set_header   X-Forwarded-For    $proxy_add_x_forwarded_for;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_read_timeout 86400;
+        }
     }
 }

peerprep/components/questionpage/Matchmaking.tsx

@@ -17,7 +17,7 @@ import {
 import ResettingStopwatch from "../shared/ResettingStopwatch";
 import PeerprepDropdown from "../shared/PeerprepDropdown";
 
-const QUERY_INTERVAL_MILLISECONDS = 5000;
+const QUERY_INTERVAL_MILLISECONDS = 1000;
 const TIMEOUT_MILLISECONDS = 30000;
 
 const getMatchRequestTime = (): string => {

peerprep/next.config.js

@@ -1,15 +1,15 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {}
+const nextConfig = {};
 
 module.exports = {
   async rewrites() {
     return [
       {
-        source: '/api/proxy', // client connects to api/proxy
+        source: "/api/proxy", // client connects to api/proxy
         // by default we expect NEXT_PUBLIC_COLLAB to be http://collab:4000.
         // double check this before using this.
-        destination: `${process.env.NEXT_PUBLIC_COLLAB}/ws`,
-      }
-    ]
-  }
-}
+        destination: `${process.env.NEXT_PUBLIC_NGINX}/${process.env.NEXT_PUBLIC_COLLAB}/ws`,
+      },
+    ];
+  },
+};