Attempt to fix collab ws issues

Merged in relevant changes from n1-comm while incorporating nginx

Author: alvinlim277

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;
@@ -74,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`,
+      },
+    ];
+  },
+};