Работа с токенами сессий вынесена в отдельный класс

server/controllers/WebSocketController.js

@@ -6,18 +6,15 @@ const WebWorker = require('../core/WebWorker');//singleton
 const log = new (require('../core/AppLogger'))().log;//singleton
 const utils = require('../core/utils');
 
-const cleanPeriod = 1*60*1000;//1 минута, не менять!
-const cleanUnusedTokenTimeout = 5*60*1000;//5 минут
+const cleanPeriod = 1*60*1000;//1 минута
 const closeSocketOnIdle = 5*60*1000;//5 минут
 
 class WebSocketController {
-    constructor(wss, config) {
+    constructor(wss, webAccess, config) {
         this.config = config;
         this.isDevelopment = (config.branch == 'development');
 
-        this.freeAccess = (config.accessPassword === '');
-        this.accessTimeout = config.accessTimeout*60*1000;
-        this.accessMap = new Map();
+        this.webAccess = webAccess;
 
         this.workerState = new WorkerState();
         this.webWorker = new WebWorker(config);
@@ -34,53 +31,28 @@ class WebSocketController {
             });
         });
 
-        setTimeout(() => { this.periodicClean(); }, cleanPeriod);
+        this.periodicClean();//no await
     }
 
-    periodicClean() {
-        try {
-            const now = Date.now();
+    async periodicClean() {
+        while (1) {//eslint-disable-line no-constant-condition
+            try {
+                const now = Date.now();
 
-            //почистим accessMap
-            if (!this.freeAccess) {
-                for (const [accessToken, accessRec] of this.accessMap) {
-                    if (   !(accessRec.used > 0 || now - accessRec.time < cleanUnusedTokenTimeout)
-                        || !(this.accessTimeout === 0 || now - accessRec.time < this.accessTimeout)
-                        ) {
-                        this.accessMap.delete(accessToken);
+                //почистим ws-клиентов
+                this.wss.clients.forEach((ws) => {
+                    if (!ws.lastActivity || now - ws.lastActivity > closeSocketOnIdle - 50) {
+                        ws.terminate();
                     }
-                }
+                });
+            } catch(e) {
+                log(LM_ERR, `WebSocketController.periodicClean error: ${e.message}`);
             }
-
-            //почистим ws-клиентов
-            this.wss.clients.forEach((ws) => {
-                if (!ws.lastActivity || now - ws.lastActivity > closeSocketOnIdle - 50) {
-                    ws.terminate();
-                }
-            });
-        } finally {
-            setTimeout(() => { this.periodicClean(); }, cleanPeriod);
+            
+            await utils.sleep(cleanPeriod);
         }
     }
 
-    hasAccess(accessToken) {
-        if (this.freeAccess)
-            return true;
-
-        const accessRec = this.accessMap.get(accessToken);
-        if (accessRec) {
-            const now = Date.now();
-
-            if (this.accessTimeout === 0 || now - accessRec.time < this.accessTimeout) {
-                accessRec.used++;
-                accessRec.time = now;
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     async onMessage(ws, message) {
         let req = {};
         try {
@@ -96,12 +68,9 @@ class WebSocketController {
             this.send({_rok: 1}, req, ws);
 
             //access
-            if (!this.hasAccess(req.accessToken)) {
+            if (!this.webAccess.hasAccess(req.accessToken)) {
                 await utils.sleep(500);
-                const salt = utils.randomHexString(32);
-                const accessToken = utils.getBufHash(this.config.accessPassword + salt, 'sha256', 'hex');
-                this.accessMap.set(accessToken, {time: Date.now(), used: 0});
-
+                const salt = this.webAccess.newToken();
                 this.send({error: 'need_access_token', salt}, req, ws);
                 return;
             }
@@ -163,14 +132,14 @@ class WebSocketController {
     }
 
     async logout(req, ws) {
-        this.accessMap.delete(req.accessToken);
+        await this.webAccess.deleteAccess(req.accessToken);
         this.send({success: true}, req, ws);
     }
 
     async getConfig(req, ws) {
         const config = _.pick(this.config, this.config.webConfigParams);
         config.dbConfig = await this.webWorker.dbConfig();
-        config.freeAccess = this.freeAccess;
+        config.freeAccess = this.webAccess.freeAccess;
 
         this.send(config, req, ws);
     }