Add Dockerfile to Comms module

Unsuccessful attempt to tunnel the socketio into the backend.
Current proposed solution is to expose the backend comms service
on a port.

Author: WZWren

comms/Dockerfile

@@ -0,0 +1,8 @@
+FROM node:lts-alpine3.20
+
+WORKDIR /comms
+COPY package*.json ./
+RUN npm install --force
+COPY . .
+EXPOSE 4001
+CMD ["npm", "run", "dev"]

comms/server.js

@@ -5,8 +5,7 @@ const server = http.createServer(app);
 const io = require("socket.io")(server, {
   cors: {
     // temporarily use * to allow all origins
-    origin: `*`,
-    methods: [ "GET", "POST" ]
+    origin: `*`
   }
 });
 

compose.yaml

@@ -135,6 +135,19 @@ services:
           path: collab
           target: collab/app
 
+  comms:
+    build: comms
+    image: wzwren/comms
+    env_file:
+      - comms/.env
+    ports:
+      - "4001:4001"
+    develop:
+      watch:
+        - action: sync
+          path: comms
+          target: /comms
+
   nginx:
     build: nginx
     image: distractedcat/nginx

nginx/nginx.conf

@@ -44,6 +44,10 @@ http {
         server collab:4000;
     }
 
+    # upstream comms {
+    #     server comms:4001;
+    # }
+
     server {
         listen 80;
         location / {
@@ -85,5 +89,27 @@ http {
             proxy_set_header Connection "upgrade";
             proxy_read_timeout 86400;
         }
+
+        # location /comms/ {
+        #     proxy_pass http://comms/;
+        #     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_read_timeout 86400;
+        # }
+
+        # location /socket.io/ {
+        #     proxy_pass http://comms/socket.io/;
+        #     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/CommsPanel.tsx

@@ -7,7 +7,7 @@ interface Props {
   roomId?: String;
 }
 
-const socket = io("http://localhost:4001");
+const socket = io(`${process.env.NEXT_PUBLIC_COMMS}`);
 
 function CommsPanel({ className, roomId }: Props) {
   const [stream, setStream] = useState<MediaStream>();
@@ -61,6 +61,8 @@ function CommsPanel({ className, roomId }: Props) {
 
   useEffect(() => {
     if (!roomId || !stream || !socket.connected) {
+      console.log("stream status: " + stream);
+      console.log("connection status: " + socket.connected);
       return;
     }
     console.log("in hook");

peerprep/next.config.js

@@ -10,7 +10,7 @@ module.exports = {
         // by default we expect NEXT_PUBLIC_COLLAB to be http://collab:4000.
         // double check this before using this.
         destination: `${process.env.NEXT_PUBLIC_NGINX}/${process.env.NEXT_PUBLIC_COLLAB}/ws`,
-      },
+      }
     ];
   },
 };