temp fix for collab

Author: DistractedCat

collab/Dockerfile

@@ -1,14 +1,16 @@
 FROM golang:1.20
 
-WORKDIR /collab-service
+WORKDIR /collab
 
 COPY go.mod go.sum ./
 RUN go mod download
 
 COPY . .
 
 # Build
-RUN CGO_ENABLED=0 GOOS=linux go build -o /collab-service/app
+RUN CGO_ENABLED=0 GOOS=linux go build -o /collab/app
+
+EXPOSE 4000
 
 # Run
-CMD ["/collab-service/app"]
+CMD ["/collab/app"]

collab/main.go

@@ -141,6 +141,8 @@ func (h *Hub) Run() {
 
 // ServeWs handles WebSocket requests
 func serveWs(hub *Hub, c *gin.Context, roomMappings *verify.RoomMappings) {
+
+	log.Println("handler called!")
 	roomID := c.Query("roomID")
 	if roomID == "" {
 		http.Error(c.Writer, "roomID required", http.StatusBadRequest)
@@ -221,7 +223,7 @@ func statusHandler(hub *Hub) gin.HandlerFunc {
 		for client := range hub.clients {
 			roomID := client.roomID
 			currentStatus, ok := status[roomID]
-			if !ok {
+			if (!ok) {
 				// Initialize status for a new roomID
 				status[roomID] = map[string]interface{}{
 					"clients": 1,
@@ -251,7 +253,6 @@ func main() {
 		REDIS_URI = "localhost:9190"
 	}
 	roomMappings := verify.InitialiseRoomMappings(REDIS_URI, 1)
-
 	// WebSocket connection endpoint
 	r.GET("/ws", func(c *gin.Context) {
 		serveWs(hub, c, roomMappings)

kubernetes/collab-service-deployment.yaml

@@ -14,13 +14,13 @@ spec:
       containers:
         - name: collab
           image: distractedcat/collab:1.0.0
-          imagePullPolicy: IfNotPresent
+          imagePullPolicy: Always
           env:
             - name: PORT
               value: :4000
             - name: REDIS_URI
               value: redis:6379
-            - name: USER_SERVICE_API
+            - name: USER_SERVICE_URI
               value: http://user-service:3001
           ports:
             - containerPort: 4000

kubernetes/collab-service-service.yaml

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

kubernetes/peerprep-deployment.yaml

@@ -26,6 +26,8 @@ spec:
               value: blob
             - name: NEXT_PUBLIC_NGINX
               value: http://nginx:80
+            - name: NEXT_PUBLIC_COLLAB
+              value: ws://127.0.0.1/37919
             - name: DEV_ENV
               value: not
           ports:

peerprep/api/gateway.ts

@@ -42,6 +42,7 @@ export async function fetchQuestion(
       };
     }
 
+
     // NOTE: this may cause the following: "Can't resolve canvas"
     // https://github.com/kkomelin/isomorphic-dompurify/issues/54
     const question = (await response.json()) as Question;

peerprep/components/questionpage/CollabEditor.tsx

@@ -77,8 +77,8 @@ export default function CollabEditor({ question, roomID, authToken }: Props) {
 
     console.log("Yep");
 
-    const newSocket = new WebSocket(`ws://localhost:4000/ws?roomID=${roomID}`);
-
+    const newSocket = new WebSocket(`${process.env.NEXT_PUBLIC_COLLAB}/ws?roomID=${roomID}`);
+    
     newSocket.onopen = () => {
       console.log("WebSocket connection established");
       setconnected(true);
@@ -112,8 +112,10 @@ export default function CollabEditor({ question, roomID, authToken }: Props) {
       }
     };
 
-    newSocket.onerror = () => {
-      console.log("server down");
+    newSocket.onerror = (event) => {
+      console.error("WebSocket error observed:", event);
+      console.error("WebSocket readyState:", newSocket.readyState);
+      console.error("WebSocket URL:", newSocket.url);
     };
 
     newSocket.onclose = () => {