From 8d2a7b541bb6759a37e2a7922c2d718710265e7f Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Sun, 30 Mar 2025 01:35:06 +0700
Subject: [PATCH] UBERF-9710: Fix always on status on front (#8391)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 server/server/src/sessionManager.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/server/src/sessionManager.ts b/server/server/src/sessionManager.ts
index 114bb9c3d6..cf6a2d1ba6 100644
--- a/server/server/src/sessionManager.ts
+++ b/server/server/src/sessionManager.ts
@@ -801,7 +801,7 @@ export class TSessionManager implements SessionManager {
           // No response
         },
         ctx,
-        socialStringsToUsers: this.getActiveSocialStringsToUsersMap(workspaceId),
+        socialStringsToUsers: this.getActiveSocialStringsToUsersMap(workspaceId, session),
         sendError: async () => {
           // Assume no error send
         },
@@ -1072,19 +1072,19 @@ export class TSessionManager implements SessionManager {
   }
 
   // TODO: cache this map and update when sessions created/closed
-  getActiveSocialStringsToUsersMap (workspace: WorkspaceUuid): Map<PersonId, AccountUuid> {
+  getActiveSocialStringsToUsersMap (workspace: WorkspaceUuid, ...extra: Session[]): Map<PersonId, AccountUuid> {
     const ws = this.workspaces.get(workspace)
     if (ws === undefined) {
       return new Map()
     }
 
     const res = new Map<PersonId, AccountUuid>()
-    for (const s of ws.sessions.values()) {
-      const sessionAccount = s.session.getUser()
+    for (const s of [...Array.from(ws.sessions.values()).map((it) => it.session), ...extra]) {
+      const sessionAccount = s.getUser()
       if (sessionAccount === systemAccountUuid) {
         continue
       }
-      const userSocialIds = s.session.getUserSocialIds()
+      const userSocialIds = s.getUserSocialIds()
       for (const id of userSocialIds) {
         res.set(id, sessionAccount)
       }
@@ -1358,7 +1358,7 @@ export function startSessionManager (
     opt.brandingMap,
     {
       pingTimeout: opt.pingTimeout ?? 10000,
-      reconnectTimeout: 500
+      reconnectTimeout: 5 // seconds to reconnect
     },
     opt.profiling,
     opt.accountsUrl,