From 3863f3e4ee3d94136e35b623f455d683972c69c2 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Fri, 4 Mar 2022 22:11:42 +0100 Subject: [PATCH] feat(utilities): EE support different requests --- ee/utilities/servers/websocket-cluster.js | 6 ++++++ ee/utilities/servers/websocket.js | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/ee/utilities/servers/websocket-cluster.js b/ee/utilities/servers/websocket-cluster.js index 605879922..fc26cc2d3 100644 --- a/ee/utilities/servers/websocket-cluster.js +++ b/ee/utilities/servers/websocket-cluster.js @@ -59,6 +59,9 @@ const socketsList = async function (req, res) { wsRouter.get(`/${process.env.S3_KEY}/sockets-list`, socketsList); const socketsListByProject = async function (req, res) { + if (process.env.uws !== "true") { + req.params = {projectKey: req.getParameter(0)}; + } debug && console.log(`[WS]looking for available sessions for ${req.params.projectKey}`); let liveSessions = {}; let rooms = await io.of('/').adapter.allRooms(); @@ -109,6 +112,9 @@ const socketsLive = async function (req, res) { wsRouter.get(`/${process.env.S3_KEY}/sockets-live`, socketsLive); const socketsLiveByProject = async function (req, res) { + if (process.env.uws !== "true") { + req.params = {projectKey: req.getParameter(0)}; + } debug && console.log(`[WS]looking for available LIVE sessions for ${req.params.projectKey}`); let liveSessions = {}; let rooms = await io.of('/').adapter.allRooms(); diff --git a/ee/utilities/servers/websocket.js b/ee/utilities/servers/websocket.js index 37331e7a5..974a1cf64 100644 --- a/ee/utilities/servers/websocket.js +++ b/ee/utilities/servers/websocket.js @@ -39,6 +39,9 @@ const socketsList = function (req, res) { wsRouter.get(`/${process.env.S3_KEY}/sockets-list`, socketsList); const socketsListByProject = function (req, res) { + if (process.env.uws !== "true") { + req.params = {projectKey: req.getParameter(0)}; + } debug && console.log(`[WS]looking for available sessions for ${req.params.projectKey}`); let liveSessions = {}; for (let peerId of io.sockets.adapter.rooms.keys()) { @@ -86,6 +89,9 @@ const socketsLive = async function (req, res) { wsRouter.get(`/${process.env.S3_KEY}/sockets-live`, socketsLive); const socketsLiveByProject = async function (req, res) { + if (process.env.uws !== "true") { + req.params = {projectKey: req.getParameter(0)}; + } debug && console.log(`[WS]looking for available LIVE sessions for ${req.params.projectKey}`); let liveSessions = {}; for (let peerId of io.sockets.adapter.rooms.keys()) {