From d2c97a75c8fb3fa399a530b82d1b4b21774f743d Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Tue, 19 Apr 2022 17:05:08 +0200 Subject: [PATCH] feat(assist): utilities EE-WS fixed redis routes --- ee/utilities/server.js | 5 +++++ ee/utilities/servers/websocket-cluster.js | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ee/utilities/server.js b/ee/utilities/server.js index 2c70067f1..df1a1a22f 100644 --- a/ee/utilities/server.js +++ b/ee/utilities/server.js @@ -19,6 +19,11 @@ if (process.env.uws !== "true") { let wsapp = express(); wsapp.use(request_logger("[wsapp]")); wsapp.use(request_logger("[app]")); + wsapp.get([PREFIX, `${PREFIX}/`], (req, res) => { + res.statusCode = 200; + res.end("ok!"); + } + ); wsapp.use(`/heapdump/${process.env.S3_KEY}`, dumps.router); wsapp.use(`${PREFIX}/${process.env.S3_KEY}`, socket.wsRouter); wsapp.enable('trust proxy'); diff --git a/ee/utilities/servers/websocket-cluster.js b/ee/utilities/servers/websocket-cluster.js index 59ab97927..840db4439 100644 --- a/ee/utilities/servers/websocket-cluster.js +++ b/ee/utilities/servers/websocket-cluster.js @@ -125,7 +125,7 @@ const socketsList = async function (req, res) { } respond(res, liveSessions); } -wsRouter.get(`/${process.env.S3_KEY}/sockets-list`, socketsList); +wsRouter.get(`/sockets-list`, socketsList); const socketsListByProject = async function (req, res) { debug && console.log("[WS]looking for available sessions"); @@ -151,7 +151,7 @@ const socketsListByProject = async function (req, res) { } respond(res, liveSessions[_projectKey] || []); } -wsRouter.get(`/${process.env.S3_KEY}/sockets-list/:projectKey`, socketsListByProject); +wsRouter.get(`/sockets-list/:projectKey`, socketsListByProject); const socketsLive = async function (req, res) { debug && console.log("[WS]looking for all available LIVE sessions"); @@ -179,7 +179,7 @@ const socketsLive = async function (req, res) { } respond(res, liveSessions); } -wsRouter.get(`/${process.env.S3_KEY}/sockets-live`, socketsLive); +wsRouter.get(`/sockets-live`, socketsLive); const socketsLiveByProject = async function (req, res) { debug && console.log("[WS]looking for available LIVE sessions"); @@ -208,7 +208,7 @@ const socketsLiveByProject = async function (req, res) { } respond(res, liveSessions[_projectKey] || []); } -wsRouter.get(`/${process.env.S3_KEY}/sockets-live/:projectKey`, socketsLiveByProject); +wsRouter.get(`/sockets-live/:projectKey`, socketsLiveByProject); const findSessionSocketId = async (io, peerId) => { const connected_sockets = await io.in(peerId).fetchSockets();