From 81d55a76998c5968ae0ff0567de70a78c5f99d61 Mon Sep 17 00:00:00 2001
From: Alexander Zavorotynskiy <zavorotynskiy@pm.me>
Date: Fri, 2 Jun 2023 15:56:27 +0200
Subject: [PATCH] fix(assist): fixed getSessions

---
 assist/servers/websocket.js | 15 ++++++++++-----
 assist/utils/helper.js      |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/assist/servers/websocket.js b/assist/servers/websocket.js
index 586819787..52d78549d 100644
--- a/assist/servers/websocket.js
+++ b/assist/servers/websocket.js
@@ -144,6 +144,7 @@ const socketsLiveByProject = async function (req, res) {
     let filters = await extractPayloadFromRequest(req);
     let withFilters = hasFilters(filters);
     let liveSessions = new Set();
+    const sessIDs = new Set();
     let rooms = await getAvailableRooms(io);
     for (let roomId of rooms.keys()) {
         let {projectKey, sessionId} = extractPeerId(roomId);
@@ -152,11 +153,17 @@ const socketsLiveByProject = async function (req, res) {
             for (let item of connected_sockets) {
                 if (item.handshake.query.identity === IDENTITIES.session) {
                     if (withFilters) {
-                        if (item.handshake.query.sessionInfo && isValidSession(item.handshake.query.sessionInfo, filters.filter)) {
+                        if (item.handshake.query.sessionInfo &&
+                            isValidSession(item.handshake.query.sessionInfo, filters.filter) &&
+                            !sessIDs.has(item.handshake.query.sessionInfo.sessionId)
+                        ) {
                             liveSessions.add(item.handshake.query.sessionInfo);
+                            sessIDs.set(item.handshake.query.sessionInfo.sessionId);
                         }
                     } else {
-                        liveSessions.add(item.handshake.query.sessionInfo);
+                        if (!sessIDs.has(item.handshake.query.sessionInfo.sessionId)) {
+                            liveSessions.add(item.handshake.query.sessionInfo);
+                        }
                     }
                 }
             }
@@ -164,9 +171,7 @@ const socketsLiveByProject = async function (req, res) {
     }
     let sessions = Array.from(liveSessions);
     console.log("sessions: ", sessions);
-    respond(res, _sessionId === undefined ? sortPaginate(sessions, filters)
-        : sessions.length > 0 ? sessions[0]
-            : null);
+    respond(res, _sessionId === undefined ? sortPaginate(sessions, filters) : sessions.length > 0 ? sessions[0] : null);
 }
 
 const autocomplete = async function (req, res) {
diff --git a/assist/utils/helper.js b/assist/utils/helper.js
index 9f92d2834..e842282a0 100644
--- a/assist/utils/helper.js
+++ b/assist/utils/helper.js
@@ -202,7 +202,7 @@ const sortPaginate = function (list, filters) {
     list.sort((a, b) => {
         const tA = getValue(a, "timestamp");
         const tB = getValue(b, "timestamp");
-        return tA < tB ? 1 : tA > tB ? -1 : 0;
+        return tA < tB ? 1 : tA > tB ? -1 : 0; // b - a
     });
     if (filters.sort.order) {
         list.reverse();