From bcf075a72cef5fa4fe9a3328945c2c3ad4bd7441 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 29 Mar 2022 16:23:34 +0700
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B8=20WebSocketConnection?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/webpack.base.config.js              | 7 ++++---
 client/api/reader.js                      | 2 +-
 server/controllers/WebSocketController.js | 3 +--
 server/core/WebSocketConnection.js        | 5 ++---
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/build/webpack.base.config.js b/build/webpack.base.config.js
index 747c506f..570f9193 100644
--- a/build/webpack.base.config.js
+++ b/build/webpack.base.config.js
@@ -5,11 +5,12 @@ const { VueLoaderPlugin } = require('vue-loader');
 const clientDir = path.resolve(__dirname, '../client');
 
 module.exports = {
-    /*resolve: {
+    resolve: {
         alias: {
-            vue: '@vue/compat'
+            ws: false,
+            //vue: '@vue/compat'
         }
-    },*/    
+    },
     entry: [`${clientDir}/main.js`],
     output: {
         publicPath: '/app/',
diff --git a/client/api/reader.js b/client/api/reader.js
index d3995597..742a9792 100644
--- a/client/api/reader.js
+++ b/client/api/reader.js
@@ -219,7 +219,7 @@ class Reader {
         const state = response.state;
         if (!state)
             throw new Error('Неверный ответ api');
-        if (response.state == 'error') {
+        if (state == 'error') {
             throw new Error(response.error);
         }
 
diff --git a/server/controllers/WebSocketController.js b/server/controllers/WebSocketController.js
index 1ef46135..229dbcf0 100644
--- a/server/controllers/WebSocketController.js
+++ b/server/controllers/WebSocketController.js
@@ -55,8 +55,7 @@ class WebSocketController {
             ws.lastActivity = Date.now();
             
             //pong for WebSocketConnection
-            if (req._rpo === 1)
-                this.send({_rok: 1}, req, ws);
+            this.send({_rok: 1}, req, ws);
 
             switch (req.action) {
                 case 'test':
diff --git a/server/core/WebSocketConnection.js b/server/core/WebSocketConnection.js
index d33d95f0..3045659e 100644
--- a/server/core/WebSocketConnection.js
+++ b/server/core/WebSocketConnection.js
@@ -9,8 +9,7 @@ const cleanPeriod = 5*1000;//5 секунд
 class WebSocketConnection {
     //messageLifeTime в секундах (проверка каждый cleanPeriod интервал)
     constructor(url, openTimeoutSecs = 10, messageLifeTimeSecs = 30) {
-        //const ws = 'ws';//for nodejs
-        this.WebSocket = (isBrowser ? WebSocket : null/*for nodejs require(ws)*/);
+        this.WebSocket = (isBrowser ? WebSocket : require('ws'));
         this.url = url;
         this.ws = null;
         this.listeners = [];
@@ -166,7 +165,7 @@ class WebSocketConnection {
             this.requestId = (this.requestId < 1000000 ? this.requestId + 1 : 1);
             const requestId = this.requestId;//реентерабельность!!!
 
-            this.ws.send(JSON.stringify(Object.assign({requestId, _rpo: 1}, req)));//_rpo: 1 - ждем в ответ _rok: 1
+            this.ws.send(JSON.stringify(Object.assign({requestId}, req)));
 
             let resp = {};
             try {