Merge pull request #286 from cmu15122/jtromero/fix_webhooks

potential webhook reconnection fix

Author: jacksontromero

client/package-lock.json

@@ -33,7 +33,7 @@
     "react-router-dom": "^6.3.0",
     "react-scripts": "^5.0.1",
     "react-window": "^1.8.7",
-    "socket.io-client": "^4.5.1",
+    "socket.io-client": "^4.8.1",
     "styled-components": "^5.3.5",
     "typescript": "^4.8.4",
     "underscore": "^1.13.4",

client/package.json

@@ -35,14 +35,14 @@ const AllStudentsContextProvider = ({children}: {children: React.ReactNode}) =>
         setAllStudents(data.allStudents);
       });
 
-      const handleVisibilityChange = () => {
-        if (document.visibilityState === 'visible') {
-          HomeService.getAllStudents().then((res) => {
-            setAllStudents(res.data.allStudents);
-          });
-        }
-      };
-      document.addEventListener('visibilitychange', handleVisibilityChange);
+      // const handleVisibilityChange = () => {
+      //   if (document.visibilityState === 'visible') {
+      //     HomeService.getAllStudents().then((res) => {
+      //       setAllStudents(res.data.allStudents);
+      //     });
+      //   }
+      // };
+      // document.addEventListener('visibilitychange', handleVisibilityChange);
     }
   }, [userData.isTA]);
 

client/src/contexts/AllStudentsContext.tsx

@@ -61,14 +61,14 @@ const QueueDataContextProvider = ({
       setQueueData(data);
     });
 
-    const handleVisibilityChange = () => {
-      if (document.visibilityState === 'visible') {
-        HomeService.getAll().then((res) => {
-          setQueueData(res.data);
-        });
-      }
-    };
-    document.addEventListener('visibilitychange', handleVisibilityChange);
+    // const handleVisibilityChange = () => {
+    //   if (document.visibilityState === 'visible') {
+    //     HomeService.getAll().then((res) => {
+    //       setQueueData(res.data);
+    //     });
+    //   }
+    // };
+    // document.addEventListener('visibilitychange', handleVisibilityChange);
   }, []);
 
   return (

client/src/contexts/QueueDataContext.tsx

@@ -68,16 +68,16 @@ const StudentDataContextProvider = ({children}: {children: React.ReactNode}) =>
         }
       });
 
-      const handleVisibilityChange = () => {
-        if (document.visibilityState === 'visible') {
-          HomeService.getStudentData().then((res) => {
-            if (res.status === 200 && res.data.andrewID === userData.andrewID) {
-              setStudentData(res.data);
-            }
-          });
-        }
-      };
-      document.addEventListener('visibilitychange', handleVisibilityChange);
+      // const handleVisibilityChange = () => {
+      //   if (document.visibilityState === 'visible') {
+      //     HomeService.getStudentData().then((res) => {
+      //       if (res.status === 200 && res.data.andrewID === userData.andrewID) {
+      //         setStudentData(res.data);
+      //       }
+      //     });
+      //   }
+      // };
+      // document.addEventListener('visibilitychange', handleVisibilityChange);
     }
   }, [userData.isAuthenticated]);
 

client/src/contexts/StudentDataContext.tsx

@@ -17,6 +17,10 @@ exports.init = function (server) {
         cors: {
             origin: config.PROTOCOL + "://" + config.DOMAIN + ":" + config.CLIENT_PORT,
             methods: ["GET", "POST"]
+        },
+        connectionStateRecovery: {
+            maxDisconnectionDuration: 2 * 60 * 1000,
+            skipMiddlewares: true
         }
     });
 
@@ -63,7 +67,7 @@ exports.queueData = function (queueData) {
         console.log("ERROR: Socket.io is not initialized yet");
         return;
     }
- 
+
     sio.emit("queueData", {
         ...queueData
     });

server/controllers/sockets.js

@@ -40,7 +40,7 @@
     "pg": "^8.7.3",
     "sequelize": "^6.20.1",
     "slack-webhook": "^1.0.0",
-    "socket.io": "^4.5.1"
+    "socket.io": "^4.8.1"
   },
   "devDependencies": {
     "@babel/core": "^7.18.2",