Add support for web sockets to API gateway

Author: jq1836

api-gateway/nginx.conf

@@ -0,0 +1,36 @@
+user  nginx;
+worker_processes  auto;
+
+error_log  /var/log/nginx/error.log notice;
+pid        /var/run/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    map $http_upgrade $connection_upgrade {
+        default upgrade;
+        ''      close;
+    }
+
+    include /etc/nginx/conf.d/*.conf;
+}

api-gateway/templates/api_conf.d/public_conf.d/matching_service.conf.template

@@ -1,2 +1,14 @@
 location /public/matching-service/ {
+    location /public/matching-service/match/ {
+        location /public/matching-service/match/subscribe/ {
+            proxy_pass http://matching-service/match/subscribe/;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection $connection_upgrade;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+        }
+    }
 }

docker-compose.yml

@@ -40,6 +40,7 @@ services:
     image: nginx:1.26
     volumes:
       - ./api-gateway/templates:/etc/nginx/templates
+      - ./api-gateway/nginx.conf:/etc/nginx/nginx.conf
     ports:
       - $API_GATEWAY_PORT:$API_GATEWAY_PORT
     environment:

frontend/components/matching/find-match.tsx

@@ -5,9 +5,9 @@ import { SearchProgress } from "@/components/matching/search-progress";
 import { SelectionSummary } from "@/components/matching/selection-summary";
 import { useToast } from "@/components/hooks/use-toast";
 import { useAuth } from "@/app/auth/auth-context";
-import { joinMatchQueue } from "@/lib/join-match-queue";
-import { leaveMatchQueue } from "@/lib/leave-match-queue";
-import { subscribeMatch } from "@/lib/subscribe-match";
+import { joinMatchQueue } from "@/lib/api/matching-service/join-match-queue";
+import { leaveMatchQueue } from "@/lib/api/matching-service/leave-match-queue";
+import { subscribeMatch } from "@/lib/api/matching-service/subscribe-match";
 
 export default function FindMatch() {
   const [selectedDifficulty, setSelectedDifficulty] = useState<string>("");

frontend/lib/api/api-uri.ts

@@ -13,8 +13,8 @@ const constructUri = (
   `http://${process.env.NEXT_PUBLIC_BASE_URI || baseUri}:${process.env.NEXT_PUBLIC_API_GATEWAY_PORT}/${authType}/${serviceName}`;
 
 export const userServiceUri: (baseUri: string, authType: AuthType) => string = (
-  baseUri,
-  authType
+  baseUri: string,
+  authType: AuthType
 ) => constructUri(baseUri, authType, "user-service");
 export const questionServiceUri: (
   baseUri: string,
@@ -27,9 +27,15 @@ export const matchingServiceUri: (
 ) => string = (baseUri, authType) =>
   constructUri(baseUri, authType, "matching-service");
 
-const constructWebSockUri = (baseUri: string) =>
-  `ws://${process.env.NEXT_PUBLIC_BASE_URI || baseUri}:${process.env.NEXT_PUBLIC_API_GATEWAY_PORT}`;
+const constructWebSockUri = (
+  baseUri: string,
+  authType: AuthType,
+  serviceName: string
+) =>
+  `ws://${process.env.NEXT_PUBLIC_BASE_URI || baseUri}:${process.env.NEXT_PUBLIC_API_GATEWAY_PORT}/${authType}/${serviceName}`;
 
-export const matchingServiceWebSockUri: (baseUri: string) => string = (
-  baseUri
-) => constructWebSockUri(baseUri);
+export const matchingServiceWebSockUri: (
+  baseUri: string,
+  authType: AuthType
+) => string = (baseUri, authType) =>
+  constructWebSockUri(baseUri, authType, "matching-service");

frontend/lib/join-match-queue.ts renamed to frontend/lib/api/matching-service/join-match-queue.ts

@@ -1,4 +1,4 @@
-import { matchingServiceUri } from "@/lib/api/api-uri";
+import { AuthType, matchingServiceUri } from "@/lib/api/api-uri";
 
 export const joinMatchQueue = async (
   jwtToken: string,
@@ -11,7 +11,7 @@ export const joinMatchQueue = async (
     difficulty: complexity,
   }).toString();
   const response = await fetch(
-    `${matchingServiceUri(window.location.hostname)}/match/queue/${userId}?${params}`,
+    `${matchingServiceUri(window.location.hostname, AuthType.Private)}/match/queue/${userId}?${params}`,
     {
       method: "POST",
       headers: {

frontend/lib/leave-match-queue.ts renamed to frontend/lib/api/matching-service/leave-match-queue.ts

@@ -1,4 +1,4 @@
-import { matchingServiceUri } from "@/lib/api/api-uri";
+import { AuthType, matchingServiceUri } from "@/lib/api/api-uri";
 
 export const leaveMatchQueue = async (
   jwtToken: string,
@@ -11,7 +11,7 @@ export const leaveMatchQueue = async (
     difficulty: complexity,
   }).toString();
   const response = await fetch(
-    `${matchingServiceUri(window.location.hostname)}/match/queue/${userId}?${params}`,
+    `${matchingServiceUri(window.location.hostname, AuthType.Private)}/match/queue/${userId}?${params}`,
     {
       method: "DELETE",
       headers: {

frontend/lib/subscribe-match.ts renamed to frontend/lib/api/matching-service/subscribe-match.ts

@@ -1,4 +1,4 @@
-import { matchingServiceWebSockUri } from "@/lib/api/api-uri";
+import { AuthType, matchingServiceWebSockUri } from "@/lib/api/api-uri";
 
 export const subscribeMatch = async (
   userId: string,
@@ -10,6 +10,6 @@ export const subscribeMatch = async (
     difficulty: complexity,
   });
   return new WebSocket(
-    `${matchingServiceWebSockUri(window.location.hostname)}/match/subscribe/${userId}?${params}`
+    `${matchingServiceWebSockUri(window.location.hostname, AuthType.Public)}/match/subscribe/${userId}?${params}`
   );
 };