CB-4436 update session only in touchSession

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

@@ -93,12 +93,11 @@ public WebSession getWebSession(@NotNull HttpServletRequest request,
     }
 
     @NotNull
-    public WebSession getWebSession(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response, boolean errorOnNoFound) throws DBWebException {
-        return getWebSession(request, response, true, errorOnNoFound);
-    }
-
-    @NotNull
-    public WebSession getWebSession(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response, boolean updateInfo, boolean errorOnNoFound) throws DBWebException {
+    public WebSession getWebSession(
+        @NotNull HttpServletRequest request,
+        @NotNull HttpServletResponse response,
+        boolean errorOnNoFound
+    ) throws DBWebException {
         HttpSession httpSession = request.getSession(true);
         String sessionId = httpSession.getId();
         WebSession webSession;
@@ -139,13 +138,6 @@ public WebSession getWebSession(@NotNull HttpServletRequest request, @NotNull Ht
                     throw new DBWebException("Unexpected session type: " + baseWebSession.getClass().getName());
                 }
                 webSession = (WebSession) baseWebSession;
-                if (updateInfo) {
-                    // Update only once per request
-                    if (!CommonUtils.toBoolean(request.getAttribute("sessionUpdated"))) {
-                        webSession.updateInfo(request, response);
-                        request.setAttribute("sessionUpdated", true);
-                    }
-                }
             }
         }
 

webapp/packages/core-app/package.json

@@ -18,6 +18,7 @@
   },
   "dependencies": {
     "@cloudbeaver/core-blocks": "~0.1.0",
+    "@cloudbeaver/core-client-activity": "~0.1.0",
     "@cloudbeaver/core-di": "~0.1.0",
     "@cloudbeaver/core-executor": "~0.1.0",
     "@cloudbeaver/core-localization": "~0.1.0",

webapp/packages/core-app/src/Body.tsx

@@ -21,6 +21,7 @@ import { useAppVersion } from '@cloudbeaver/core-version';
 
 import style from './Body.m.css';
 import { useAppHeight } from './useAppHeight';
+import { useClientActivity } from './useClientActivity';
 
 export const Body = observer(function Body() {
   // const serverConfigLoader = useResource(Body, ServerConfigResource, undefined);
@@ -44,6 +45,7 @@ export const Body = observer(function Body() {
   });
 
   useAppHeight();
+  useClientActivity();
 
   return (
     <DNDProvider>

webapp/packages/core-app/src/useClientActivity.ts

@@ -0,0 +1,44 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { useEffect } from 'react';
+
+import { ClientActivityService } from '@cloudbeaver/core-client-activity';
+import { useService } from '@cloudbeaver/core-di';
+import { throttle } from '@cloudbeaver/core-utils';
+
+const UPDATE_THROTTLE = 300;
+
+export function useClientActivity() {
+  const clientActivityService = useService(ClientActivityService);
+
+  const updateActivity = throttle(function updateActivity() {
+    clientActivityService.updateActivity();
+  }, UPDATE_THROTTLE);
+
+  function subscribeEvents() {
+    document.addEventListener('mousemove', updateActivity);
+    document.addEventListener('click', updateActivity);
+    document.addEventListener('keydown', updateActivity);
+    document.addEventListener('scroll', updateActivity);
+  }
+
+  function unsubscribeEvents() {
+    document.removeEventListener('mousemove', updateActivity);
+    document.removeEventListener('click', updateActivity);
+    document.removeEventListener('keydown', updateActivity);
+    document.removeEventListener('scroll', updateActivity);
+  }
+
+  useEffect(() => {
+    subscribeEvents();
+
+    return () => {
+      unsubscribeEvents();
+    };
+  }, []);
+}

webapp/packages/core-app/tsconfig.json

@@ -9,6 +9,9 @@
     {
       "path": "../core-blocks/tsconfig.json"
     },
+    {
+      "path": "../core-client-activity/tsconfig.json"
+    },
     {
       "path": "../core-di/tsconfig.json"
     },

webapp/packages/core-bootstrap/package.json

@@ -24,6 +24,7 @@
     "@cloudbeaver/core-browser": "~0.1.0",
     "@cloudbeaver/core-browser-cookies": "~0.1.0",
     "@cloudbeaver/core-browser-settings": "~0.1.0",
+    "@cloudbeaver/core-client-activity": "~0.1.0",
     "@cloudbeaver/core-connections": "~0.1.0",
     "@cloudbeaver/core-di": "~0.1.0",
     "@cloudbeaver/core-dialogs": "~0.1.0",

webapp/packages/core-bootstrap/src/manifest.ts

@@ -12,6 +12,7 @@ import { coreBlocksManifest } from '@cloudbeaver/core-blocks';
 import { coreBrowserManifest } from '@cloudbeaver/core-browser';
 import { coreBrowserCookiesManifest } from '@cloudbeaver/core-browser-cookies';
 import { coreBrowserSettingsManifest } from '@cloudbeaver/core-browser-settings';
+import { coreClientActivityManifest } from '@cloudbeaver/core-client-activity';
 import { coreConnectionsManifest } from '@cloudbeaver/core-connections';
 import { coreDIManifest, PluginManifest } from '@cloudbeaver/core-di';
 import { coreDialogsManifest } from '@cloudbeaver/core-dialogs';
@@ -74,5 +75,6 @@ export const coreManifests: PluginManifest[] = [
   coreDialogsManifest,
   resourceManagerManifest,
   coreAppManifest,
+  coreClientActivityManifest,
   coreNavigationTree,
 ];

webapp/packages/core-bootstrap/tsconfig.json

@@ -27,6 +27,9 @@
     {
       "path": "../core-browser/tsconfig.json"
     },
+    {
+      "path": "../core-client-activity/tsconfig.json"
+    },
     {
       "path": "../core-connections/tsconfig.json"
     },

webapp/packages/core-client-activity/.gitignore

@@ -0,0 +1,21 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/lib
+
+# misc
+.DS_Store
+.env*
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*

webapp/packages/core-client-activity/package.json

@@ -0,0 +1,28 @@
+{
+  "name": "@cloudbeaver/core-client-activity",
+  "sideEffects": [
+    "src/**/*.css",
+    "src/**/*.scss",
+    "public/**/*"
+  ],
+  "version": "0.1.0",
+  "description": "",
+  "license": "Apache-2.0",
+  "main": "dist/index.js",
+  "scripts": {
+    "build": "tsc -b",
+    "lint": "eslint ./src/ --ext .ts,.tsx",
+    "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix",
+    "validate-dependencies": "core-cli-validate-dependencies",
+    "update-ts-references": "rimraf --glob dist && typescript-resolve-references"
+  },
+  "dependencies": {
+    "@cloudbeaver/core-di": "~0.1.0",
+    "@cloudbeaver/core-executor": "~0.1.0",
+    "mobx": "^6.12.0"
+  },
+  "peerDependencies": {},
+  "devDependencies": {
+    "typescript": "^5.3.2"
+  }
+}

webapp/packages/core-client-activity/src/ClientActivityService.ts

@@ -0,0 +1,58 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { makeObservable, observable } from 'mobx';
+
+import { injectable } from '@cloudbeaver/core-di';
+import { Executor, IExecutor } from '@cloudbeaver/core-executor';
+
+const INACTIVE_PERIOD_TIME = 1000 * 60;
+
+@injectable()
+export class ClientActivityService {
+  private timer: ReturnType<typeof setTimeout> | null;
+  public isActive: boolean;
+  public onActiveStateChange: IExecutor<boolean>;
+
+  constructor() {
+    this.setActivity = this.setActivity.bind(this);
+    this.updateActivity = this.updateActivity.bind(this);
+    this.resetActivity = this.resetActivity.bind(this);
+
+    this.timer = null;
+    this.isActive = false;
+    this.onActiveStateChange = new Executor();
+
+    makeObservable(this, {
+      isActive: observable,
+    });
+  }
+
+  private setActivity(value: boolean) {
+    this.isActive = value;
+    this.onActiveStateChange.execute(value);
+  }
+
+  resetActivity() {
+    this.setActivity(false);
+
+    if (this.timer) {
+      clearTimeout(this.timer);
+      this.timer = null;
+    }
+  }
+
+  updateActivity() {
+    this.setActivity(true);
+
+    if (this.timer) {
+      clearTimeout(this.timer);
+    }
+
+    this.timer = setTimeout(this.resetActivity, INACTIVE_PERIOD_TIME);
+  }
+}

webapp/packages/core-client-activity/src/index.ts

@@ -0,0 +1,2 @@
+export * from './ClientActivityService';
+export * from './manifest';

webapp/packages/core-client-activity/src/manifest.ts

@@ -0,0 +1,18 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import type { PluginManifest } from '@cloudbeaver/core-di';
+
+import { ClientActivityService } from './ClientActivityService';
+
+export const coreClientActivityManifest: PluginManifest = {
+  info: {
+    name: 'Core Client Activity',
+  },
+
+  providers: [ClientActivityService],
+};

webapp/packages/core-client-activity/tsconfig.json

@@ -0,0 +1,28 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "dist",
+    "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo"
+  },
+  "references": [
+    {
+      "path": "../core-di/tsconfig.json"
+    },
+    {
+      "path": "../core-executor/tsconfig.json"
+    }
+  ],
+  "include": [
+    "__custom_mocks__/**/*",
+    "src/**/*",
+    "src/**/*.json",
+    "src/**/*.css",
+    "src/**/*.scss"
+  ],
+  "exclude": [
+    "**/node_modules",
+    "lib/**/*",
+    "dist/**/*"
+  ]
+}

webapp/packages/core-root/package.json

@@ -17,6 +17,7 @@
     "update-ts-references": "rimraf --glob dist && typescript-resolve-references"
   },
   "dependencies": {
+    "@cloudbeaver/core-client-activity": "~0.1.0",
     "@cloudbeaver/core-di": "~0.1.0",
     "@cloudbeaver/core-executor": "~0.1.0",
     "@cloudbeaver/core-resource": "~0.1.0",

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

@@ -0,0 +1,43 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { ClientActivityService } from '@cloudbeaver/core-client-activity';
+import { Dependency, injectable } from '@cloudbeaver/core-di';
+
+import { SessionResource } from './SessionResource';
+
+export const SESSION_TOUCH_TIME_PERIOD = 1000 * 60;
+
+@injectable()
+export class SessionActivityService extends Dependency {
+  private touchSessionTimer: ReturnType<typeof setTimeout> | null = null;
+
+  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() {
+    if (this.touchSessionTimer || !this.clientActivityService.isActive) {
+      return;
+    }
+
+    try {
+      await this.sessionResource.touchSession();
+    } catch (e) {
+      console.error('Session touch error', e);
+    }
+
+    this.touchSessionTimer = setTimeout(() => {
+      if (this.touchSessionTimer) {
+        clearTimeout(this.touchSessionTimer);
+        this.touchSessionTimer = null;
+      }
+    }, SESSION_TOUCH_TIME_PERIOD);
+  }
+}

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

@@ -9,16 +9,26 @@ import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { Executor, IExecutor } from '@cloudbeaver/core-executor';
 import { EServerErrorCode, GQLError, GraphQLService, SessionError } from '@cloudbeaver/core-sdk';
 import { errorOf } from '@cloudbeaver/core-utils';
+
+export const SESSION_EXPIRE_MIN_TIME = 5 * 1000 * 60;
+
 @injectable()
 export class SessionExpireService extends Bootstrap {
-  expired = false;
+  private isExpired = false;
 
   onSessionExpire: IExecutor;
   constructor(private readonly graphQLService: GraphQLService) {
     super();
+
+    this.sessionExpired = this.sessionExpired.bind(this);
+
     this.onSessionExpire = new Executor();
   }
 
+  get expired() {
+    return this.isExpired;
+  }
+
   register(): void {
     this.graphQLService.registerInterceptor(this.sessionExpiredInterceptor.bind(this));
   }
@@ -32,7 +42,7 @@ export class SessionExpireService extends Bootstrap {
 
     const e = new SessionError('Session expired');
     this.graphQLService.blockRequests(e);
-    this.expired = true;
+    this.isExpired = true;
     this.onSessionExpire.execute();
   }