Merge pull request #627 from encorelab/develop

Fix the bug getting econnreset error on production server

backend/src/socket/socket.ts

@@ -41,6 +41,8 @@ class Socket {
           methods: ['GET', 'POST'],
         },
         adapter: createAdapter(redis.getPublisher, redis.getSubscriber),
+        pingTimeout: 60000, // 60 seconds (adjust as needed)
+        pingInterval: 25000, // 25 seconds (adjust as needed) 
       });
 
       this._io = io;
@@ -80,11 +82,15 @@ class Socket {
         });
 
         socket.on('disconnect', () => {
+          console.warn(`Socket ${socket.id} disconnected:`);
+
+          // 1. Leave all rooms
           const rooms = socket.rooms;
           rooms.forEach((room) => {
             socket.leave(room);
-            // Potentially update or notify the room of the disconnect
           });
+
+          // 2. Remove from SocketManager
           this._socketManager.removeBySocketId(socket.id);
         });
 

frontend/src/app/services/socket.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Socket } from 'ngx-socket-io';
-import { Observable, Subscription, take } from 'rxjs';
+import { Observable, Subscription, take, catchError, of } from 'rxjs';
 import { SocketPayload } from '../models/socketPayload';
 import { SocketEvent } from '../utils/constants';
 import { TraceService } from './trace.service';
@@ -9,6 +9,10 @@ import { TraceService } from './trace.service';
   providedIn: 'root',
 })
 export class SocketService {
+  private retryCount = 0;
+  private maxRetries = 10;
+  private retryInterval = 5000;
+
   constructor(private socket: Socket, private traceService: TraceService) {}
 
   /**
@@ -19,6 +23,10 @@ export class SocketService {
    */
   connect(userID: string, boardID: string): void {
     this.socket.emit('join', userID, boardID);
+
+    this.socket.on('connect_error', (error: Error) => {
+      console.error('Socket connection error:', error);
+    });
   }
 
   /**
@@ -29,7 +37,12 @@ export class SocketService {
    * @returns subscription object to unsubscribe from in the future
    */
   listen(event: SocketEvent, handler: Function): Subscription {
-    const observable = this.socket.fromEvent<any>(event);
+    const observable = this.socket.fromEvent<any>(event).pipe(
+      catchError((error: Error) => {
+        console.error(`Error handling event ${event}:`, error);
+        return of(null); // Return a default value
+      })
+    );
     return observable.subscribe((value) => handler(value));
   }
 
@@ -41,8 +54,14 @@ export class SocketService {
    * @returns subscription object to unsubscribe from in the future
    */
   once(event: SocketEvent, handler: Function): Subscription {
-    const observable = this.socket.fromEvent<any>(event);
-    return observable.pipe(take(1)).subscribe((value) => handler(value)); // Use take(1) to complete after the first emission
+    const observable = this.socket.fromEvent<any>(event).pipe(
+      take(1),
+      catchError((error: Error) => {
+        console.error(`Error handling event ${event}:`, error);
+        return of(null); // Return a default value
+      })
+    );
+    return observable.subscribe((value) => handler(value)); 
   }
 
   /**