CB-4686 add new client event for updating session info

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java

@@ -125,20 +125,21 @@ public class WebSession extends BaseWebSession
     private final Map<String, DBWSessionHandler> sessionHandlers;
 
     public WebSession(
-        @NotNull HttpSession httpSession,
+        @NotNull HttpServletRequest request,
         @NotNull WebAuthApplication application,
         @NotNull Map<String, DBWSessionHandler> sessionHandlers
     ) throws DBException {
-        super(httpSession.getId(), application);
+        super(request.getSession().getId(), application);
         this.lastAccessTime = this.createTime;
-        setLocale(CommonUtils.toString(httpSession.getAttribute(ATTR_LOCALE), this.locale));
+        setLocale(CommonUtils.toString(request.getSession().getAttribute(ATTR_LOCALE), this.locale));
         this.sessionHandlers = sessionHandlers;
         //force authorization of anonymous session to avoid access error,
         //because before authorization could be called by any request,
         //but now 'updateInfo' is called only in special requests,
         //and the order of requests is not guaranteed.
         //look at CB-4747
         refreshSessionAuth();
+        updateSessionParameters(request);
     }
 
     @Nullable
@@ -525,17 +526,10 @@ public List<WebServerMessage> getSessionMessages() {
         }
     }
 
-    public synchronized void updateInfo(
-        HttpServletRequest request,
-        HttpServletResponse response
-    ) throws DBWebException {
+    public synchronized void updateInfo(boolean isOldHttpSessionUsed) {
         log.debug("Update session lifetime " + getSessionId() + " for user " + getUserId());
         touchSession();
-        HttpSession httpSession = request.getSession();
-        this.lastRemoteAddr = request.getRemoteAddr();
-        this.lastRemoteUserAgent = request.getHeader("User-Agent");
-        this.cacheExpired = false;
-        if (!httpSession.isNew()) {
+        if (isOldHttpSessionUsed) {
             try {
                 // Persist session
                 if (!isAuthorizedInSecurityManager()) {
@@ -555,6 +549,12 @@ public synchronized void updateInfo(
         }
     }
 
+    public synchronized void updateSessionParameters(HttpServletRequest request) {
+        this.lastRemoteAddr = request.getRemoteAddr();
+        this.lastRemoteUserAgent = request.getHeader("User-Agent");
+        this.cacheExpired = false;
+    }
+
     @Association
     public List<WebConnectionInfo> getConnections() {
         synchronized (connections) {

server/bundles/io.cloudbeaver.server/schema/service.core.graphqls

@@ -566,9 +566,9 @@ extend type Mutation {
     closeSession: Boolean
 
     # Refreshes session on server and returns its state
-    touchSession: Boolean  @deprecated(reason: "use updateSession instead")
+    touchSession: Boolean  @deprecated(reason: "use events to update session")
     # Refreshes session on server and returns session state
-    updateSession: SessionInfo! @since(version: "24.0.0")
+    updateSession: SessionInfo! @since(version: "24.0.0") @deprecated(reason: "use events to update session")
 
     # Refresh session connection list
     refreshSessionConnections: Boolean

server/bundles/io.cloudbeaver.server/schema/service.events.graphqls

@@ -37,7 +37,8 @@ enum CBServerEventId {
 enum CBClientEventId {
     cb_client_topic_subscribe,
     cb_client_topic_unsubscribe,
-    cb_client_projects_active
+    cb_client_projects_active,
+    cb_client_touch_session
 }
 
 # Client subscribes on topic to receive only related events
@@ -114,8 +115,12 @@ type WSSocketConnectedEvent implements CBServerEvent {
 type WSSessionStateEvent implements CBServerEvent {
     id: CBServerEventId!
     topicId: CBEventTopic
+    lastAccessTime: Int!
     remainingTime: Int!
     isValid: Boolean
+    isCacheExpired: Boolean
+    locale: String!
+    actionParameters: Object
 }
 
 # Session expired event

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/websockets/CBEventsWebSocket.java

@@ -18,6 +18,7 @@
 
 import io.cloudbeaver.DBWebException;
 import io.cloudbeaver.model.session.BaseWebSession;
+import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.websocket.CBWebSessionEventHandler;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.WriteCallback;
@@ -76,6 +77,12 @@ public void onWebSocketText(String message) {
                 this.webSession.getEventsFilter().setSubscribedProjects(projectEvent.getProjectIds());
                 break;
             }
+            case TOUCH_SESSION: {
+                if (webSession instanceof WebSession session) {
+                    session.updateInfo(true);
+                }
+                break;
+            }
             default:
                 var e = new DBWebException("Unknown websocket client event: " + clientEvent.getId());
                 log.error(e.getMessage(), e);

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/websockets/CBJettyWebSocketManager.java

@@ -29,6 +29,7 @@
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.security.exception.SMAccessTokenExpiredException;
+import org.jkiss.dbeaver.runtime.DBWorkbench;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
@@ -54,6 +55,7 @@ public Object createWebSocket(@NotNull JettyServerUpgradeRequest request, JettyS
         var httpRequest = request.getHttpServletRequest();
         var webSession = webSessionManager.getOrRestoreSession(httpRequest);
         if (webSession != null) {
+            webSession.updateSessionParameters(httpRequest);
             // web client session
             return createNewEventsWebSocket(webSession);
         }

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/DBWServiceCore.java

@@ -94,6 +94,7 @@ WebSession openSession(
     @WebAction(authRequired = false)
     boolean touchSession(@NotNull HttpServletRequest request, @NotNull HttpServletResponse servletResponse) throws DBWebException;
 
+    @Deprecated
     @WebAction(authRequired = false)
     WebSession updateSession(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response)
         throws DBWebException;

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java

@@ -282,11 +282,13 @@ public boolean closeSession(HttpServletRequest request) throws DBWebException {
     }
 
     @Override
+    @Deprecated
     public boolean touchSession(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response) throws DBWebException {
         return CBPlatform.getInstance().getSessionManager().touchSession(request, response);
     }
 
     @Override
+    @Deprecated
     public WebSession updateSession(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response)
         throws DBWebException {
         WebSessionManager sessionManager = CBPlatform.getInstance().getSessionManager();

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/session/WebSessionManager.java

@@ -79,10 +79,12 @@ protected CBApplication getApplication() {
         return application;
     }
 
+    @Deprecated
     public boolean touchSession(@NotNull HttpServletRequest request,
                                 @NotNull HttpServletResponse response) throws DBWebException {
         WebSession webSession = getWebSession(request, response, false);
-        webSession.updateInfo(request, response);
+        webSession.updateSessionParameters(request);
+        webSession.updateInfo(!request.getSession().isNew());
         return true;
     }
 
@@ -105,14 +107,14 @@ public WebSession getWebSession(
             var baseWebSession = sessionMap.get(sessionId);
             if (baseWebSession == null && CBApplication.getInstance().isConfigurationMode()) {
                 try {
-                    webSession = createWebSessionImpl(httpSession);
+                    webSession = createWebSessionImpl(request);
                 } catch (DBException e) {
                     throw new DBWebException("Failed to create web session", e);
                 }
                 sessionMap.put(sessionId, webSession);
             } else if (baseWebSession == null) {
                 try {
-                    webSession = createWebSessionImpl(httpSession);
+                    webSession = createWebSessionImpl(request);
                 } catch (DBException e) {
                     throw new DBWebException("Failed to create web session", e);
                 }
@@ -174,7 +176,7 @@ public WebSession getOrRestoreSession(@NotNull HttpServletRequest request) {
                         return null;
                     }
 
-                    webSession = createWebSessionImpl(httpSession);
+                    webSession = createWebSessionImpl(request);
                     restorePreviousUserSession(webSession, oldAuthInfo);
 
                     sessionMap.put(sessionId, webSession);
@@ -208,8 +210,8 @@ private void restorePreviousUserSession(
     }
 
     @NotNull
-    protected WebSession createWebSessionImpl(@NotNull HttpSession httpSession) throws DBException {
-        return new WebSession(httpSession, application, getSessionHandlers());
+    protected WebSession createWebSessionImpl(@NotNull HttpServletRequest request) throws DBException {
+        return new WebSession(request, application, getSessionHandlers());
     }
 
     @NotNull
@@ -330,7 +332,13 @@ public void sendSessionsStates() {
                 })
                 .forEach(session -> {
                     try {
-                        session.addSessionEvent(new WSSessionStateEvent(session.getRemainingTime(), session.isValid()));
+                        session.addSessionEvent(new WSSessionStateEvent(
+                            session.getLastAccessTimeMillis(),
+                            session.getRemainingTime(),
+                            session.isValid(),
+                            ((WebSession) session).isCacheExpired(),
+                            ((WebSession) session).getLocale(),
+                            ((WebSession) session).getActionParameters()));
                     } catch (Exception e) {
                         log.error("Failed to refresh session state: " + session.getSessionId(), e);
                     }

webapp/packages/core-root/src/SessionActivityService.ts

@@ -16,22 +16,21 @@ export const SESSION_TOUCH_TIME_PERIOD = 1000 * 60;
 export class SessionActivityService extends Dependency {
   private touchSessionTimer: ReturnType<typeof setTimeout> | null = null;
 
-  constructor(private readonly clientActivityService: ClientActivityService, private readonly sessionResource: SessionResource) {
+  constructor(
+    private readonly clientActivityService: ClientActivityService,
+    private readonly sessionResource: SessionResource,
+  ) {
     super();
     this.notifyClientActivity = this.notifyClientActivity.bind(this);
     this.clientActivityService.onActiveStateChange.addHandler(this.notifyClientActivity);
   }
 
-  private async notifyClientActivity() {
+  private notifyClientActivity() {
     if (this.touchSessionTimer || !this.clientActivityService.isActive) {
       return;
     }
 
-    try {
-      await this.sessionResource.updateSession();
-    } catch (e) {
-      console.error('Session update error', e);
-    }
+    this.sessionResource.updateSession();
 
     this.touchSessionTimer = setTimeout(() => {
       if (this.touchSessionTimer) {

webapp/packages/core-root/src/SessionEventSource.ts

@@ -76,10 +76,12 @@ export class SessionEventSource implements IServerEventEmitter<ISessionEvent, IS
 
     this.openSubject.subscribe(() => {
       this.onInit.execute();
+      this.disconnected = false;
     });
 
     this.closeSubject.subscribe(event => {
       console.info(`Websocket closed: ${event.reason}`);
+      this.disconnect();
     });
 
     this.eventsSubject = merge(this.oldEventsSubject, this.subject);
@@ -120,8 +122,8 @@ export class SessionEventSource implements IServerEventEmitter<ISessionEvent, IS
   multiplex<T = ISessionEvent>(topicId: SessionEventTopic, mapTo: (event: ISessionEvent) => T = e => e as T): Observable<T> {
     return merge(
       this.subject.multiplex(
-        () => ({ id: ClientEventId.CbClientTopicSubscribe, topicId } as ITopicSubEvent),
-        () => ({ id: ClientEventId.CbClientTopicUnsubscribe, topicId } as ITopicSubEvent),
+        () => ({ id: ClientEventId.CbClientTopicSubscribe, topicId }) as ITopicSubEvent,
+        () => ({ id: ClientEventId.CbClientTopicUnsubscribe, topicId }) as ITopicSubEvent,
         event => event.topicId === topicId,
       ),
       this.oldEventsSubject,
@@ -135,6 +137,26 @@ export class SessionEventSource implements IServerEventEmitter<ISessionEvent, IS
 
   disconnect() {
     this.disconnected = true;
+
+    if (!this.subject.closed) {
+      this.subject.unsubscribe();
+    }
+
+    if (!this.closeSubject.closed) {
+      this.closeSubject.unsubscribe();
+    }
+
+    if (!this.openSubject.closed) {
+      this.openSubject.unsubscribe();
+    }
+
+    if (!this.oldEventsSubject.closed) {
+      this.oldEventsSubject.unsubscribe();
+    }
+
+    if (!this.errorSubject.closed) {
+      this.errorSubject.unsubscribe();
+    }
   }
 
   private handleErrors() {

webapp/packages/core-root/src/SessionInfoEventHandler.ts

@@ -6,10 +6,10 @@
  * you may not use this file except in compliance with the License.
  */
 import { injectable } from '@cloudbeaver/core-di';
-import type { WsSessionStateEvent as ISessionStateEvent } from '@cloudbeaver/core-sdk';
+import { type CbClientEvent, CbEventTopic, type WsSessionStateEvent as ISessionStateEvent } from '@cloudbeaver/core-sdk';
 
 import { TopicEventHandler } from './ServerEventEmitter/TopicEventHandler';
-import { ISessionEvent, SessionEventId, SessionEventSource, SessionEventTopic } from './SessionEventSource';
+import { ClientEventId, ISessionEvent, SessionEventId, SessionEventSource, SessionEventTopic } from './SessionEventSource';
 
 export { type ISessionStateEvent };
 
@@ -19,6 +19,10 @@ export class SessionInfoEventHandler extends TopicEventHandler<ISessionStateEven
     super(SessionEventTopic.CbSession, sessionEventSource);
   }
 
+  updateSession(): void {
+    this.emit<CbClientEvent>({ id: ClientEventId.CbClientTouchSession, topicId: CbEventTopic.CbSession });
+  }
+
   map(event: any): ISessionStateEvent {
     return event;
   }