added path condition to socket server

swciitg · Mar 29, 2024 · 27e4e2d · 27e4e2d
1 parent d42f413
commit 27e4e2d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 116 deletions.
diff --git a/app.js b/app.js
@@ -9,7 +9,17 @@ const securityKeyMiddleware = require("./middlewares/securityKeyMiddleware");
 
 const app = express();
 const server = http.createServer(app);
-const wss = new WebSocket.Server({ server , path: '/ws'});
+const wss = new WebSocket.Server({ noServer: true });
+
+server.on('upgrade', (req, socket, head) => {
+    if(req.url === '/ws'){
+        wss.handleUpgrade(req, socket, head, (ws) => {
+            wss.emit('connection', ws, req);
+        });
+    } else {
+        socket.destroy();
+    }
+});
 
 app.use(express.json());
 app.use(securityKeyMiddleware);

diff --git a/helpers/websocketsHelper.js b/helpers/websocketsHelper.js
@@ -14,15 +14,13 @@ exports.authenticateConnection = async(socket, req) => {
         }
     }catch(err){
         if(axios.isAxiosError(err)){
-            console.log(err.response);
             socket.send(JSON.stringify({
                 success: false,
                 statusCode: err.response.status,
                 error: err.response.data.error,
                 message: err.response.data.message
             }));
         }else{
-            console.log(err);
             socket.send(JSON.stringify({
                 success: false,
                 statusCode: err.statusCode,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,7 +25,6 @@
   "dependencies": {
     "axios": "^1.6.8",
     "express": "^4.19.2",
-    "http": "^0.0.1-security",
     "mongoose": "^8.2.3",
     "uuid": "^9.0.1",
     "ws": "^8.16.0"