Merge branch 'release/0.11.8-6'

server/core/Reader/ReaderWorker.js

@@ -13,7 +13,9 @@ const ayncExit = new (require('../AsyncExit'))();
 const utils = require('../utils');
 const log = new (require('../AppLogger'))().log;//singleton
 
-const cleanDirPeriod = 30*60*1000;//раз в полчаса
+const cleanDirPeriod = 60*60*1000;//каждый час
+const remoteSendPeriod = 119*1000;//примерно раз 2 минуты
+
 const queue = new LimitedQueue(5, 100, 2*60*1000 + 15000);//2 минуты ожидание подвижек
 
 let instance = null;
@@ -45,20 +47,27 @@ class ReaderWorker {
                 );
             }
 
-            this.remoteConfig = {
+            this.dirConfigArr = [
-                '/tmp': {
+                {
                     dir: this.config.tempPublicDir,
+                    remoteDir: '/tmp',
                     maxSize: this.config.maxTempPublicDirSize,
                     moveToRemote: true,
                 },
-                '/upload': {
+                {
                     dir: this.config.uploadDir,
+                    remoteDir: '/upload',
                     maxSize: this.config.maxUploadPublicDirSize,
                     moveToRemote: true,
                 }
-            };
+            ];
+            //преобразуем в объект для большего удобства
+            this.dirConfig = {};
+            for (const configRec of this.dirConfigArr)
+                this.dirConfig[configRec.remoteDir] = configRec;
 
-            this.periodicCleanDir(this.remoteConfig);//no await
+            this.remoteFilesToSend = [];
+            this.periodicCleanDir();//no await
             
             instance = this;
         }
@@ -159,6 +168,13 @@ class ReaderWorker {
             const finishFilename = path.basename(compFilename);
             wState.finish({path: `/tmp/${finishFilename}`, size: stat.size});
 
+            //асинхронно через 30 сек добавим в очередь на отправку
+            //т.к. gzipFileIfNotExists может переупаковать файл
+            (async() => {
+                await utils.sleep(30*1000);
+                this.pushRemoteSend(compFilename, '/tmp');
+            })();
+
         } catch (e) {
             log(LM_ERR, e.stack);
             let mes = e.message.split('|FORLOG|');
@@ -199,6 +215,7 @@ class ReaderWorker {
 
         if (!await fs.pathExists(outFilename)) {
             await fs.move(file.path, outFilename);
+            this.pushRemoteSend(outFilename, '/upload');
         } else {
             await utils.touchFile(outFilename);
             await fs.remove(file.path);
@@ -213,6 +230,7 @@ class ReaderWorker {
 
         if (!await fs.pathExists(outFilename)) {
             await fs.writeFile(outFilename, buf);
+            this.pushRemoteSend(outFilename, '/upload');
         } else {
             await utils.touchFile(outFilename);
         }
@@ -230,8 +248,8 @@ class ReaderWorker {
 
     async restoreRemoteFile(filename, remoteDir) {
         let targetDir = '';
-        if (this.remoteConfig[remoteDir])
+        if (this.dirConfig[remoteDir])
-            targetDir = this.remoteConfig[remoteDir].dir;
+            targetDir = this.dirConfig[remoteDir].dir;
         else
             throw new Error(`restoreRemoteFile: unknown remoteDir value (${remoteDir})`);
 
@@ -252,7 +270,56 @@ class ReaderWorker {
         return targetName;
     }
 
-    async cleanDir(dir, remoteDir, maxSize, moveToRemote) {
+    pushRemoteSend(fileName, remoteDir) {
+        if (this.remoteStorage
+            && this.dirConfig[remoteDir] 
+            && this.dirConfig[remoteDir].moveToRemote) {
+            this.remoteFilesToSend.push({fileName, remoteDir});
+        }
+    }
+
+    async remoteSendFile(sendFileRec) {
+        const {fileName, remoteDir} = sendFileRec;
+        const sent = this.remoteSent;
+
+        if (!fileName || sent[fileName])
+            return;
+
+        log(`remoteSendFile ${remoteDir}/${path.basename(fileName)}`);
+
+        //отправляем в remoteStorage
+        await this.remoteStorage.putFile(fileName, remoteDir);
+        
+        sent[fileName] = true;
+        await this.appDb.insert({table: 'remote_sent', ignore: true, rows: [{id: fileName, remoteDir}]});
+    }
+
+    async remoteSendAll() {
+        if (!this.remoteStorage)
+            return;
+
+        const newSendQueue = [];
+        while (this.remoteFilesToSend.length) {
+            const sendFileRec = this.remoteFilesToSend.shift();
+
+            if (sendFileRec.remoteDir
+                && this.dirConfig[sendFileRec.remoteDir]
+                && this.dirConfig[sendFileRec.remoteDir].moveToRemote) {
+
+                try {
+                    await this.remoteSendFile(sendFileRec);
+                } catch (e) {
+                    newSendQueue.push(sendFileRec)
+                    log(LM_ERR, e.stack);
+                }
+            }
+        }
+
+        this.remoteFilesToSend = newSendQueue;
+    }
+
+    async cleanDir(config) {
+        const {dir, remoteDir, maxSize, moveToRemote} = config;
         const sent = this.remoteSent;
 
         const list = await fs.readdir(dir);
@@ -268,7 +335,7 @@ class ReaderWorker {
             }
         }
 
-        log(`clean dir ${dir}, maxSize=${maxSize}, found ${files.length} files, total size=${size}`);
+        log(LM_WARN, `clean dir ${dir}, maxSize=${maxSize}, found ${files.length} files, total size=${size}`);
 
         files.sort((a, b) => a.stat.mtimeMs - b.stat.mtimeMs);
 
@@ -278,26 +345,20 @@ class ReaderWorker {
             for (const file of files) {
                 foundFiles.add(file.name);
 
-                if (sent[file.name])
+                //отсылаем на всякий случай перед удалением, если вдруг remoteSendAll не справился
-                    continue;
-
-                //отправляем в remoteStorage
                 try {
-                    log(`remoteStorage.putFile ${remoteDir}/${path.basename(file.name)}`);
+                    await this.remoteSendFile({fileName: file.name, remoteDir});
-                    await this.remoteStorage.putFile(file.name, remoteDir);
-                    
-                    sent[file.name] = true;
-                    await this.appDb.insert({table: 'remote_sent', ignore: true, rows: [{id: file.name, remoteDir}]});
                 } catch (e) {
                     log(LM_ERR, e.stack);
                 }
             }
 
             //почистим remoteSent и БД
-            //несколько неоптимально, таскает все записи из БД
+            //несколько неоптимально, таскает все записи из таблицы
             const rows = await this.appDb.select({table: 'remote_sent'});
             for (const row of rows) {
-                if (row.remoteDir === remoteDir && !foundFiles.has(row.id)) {
+                if ((row.remoteDir === remoteDir && !foundFiles.has(row.id))
+                    || !this.dirConfig[row.remoteDir]) {
                     delete sent[row.id];
                     await this.appDb.delete({table: 'remote_sent', where: `@@id(${this.appDb.esc(row.id)})`});
                 }
@@ -322,10 +383,10 @@ class ReaderWorker {
             i++;
         }
 
-        log(`removed ${j} files`);
+        log(LM_WARN, `removed ${j} files`);
     }
 
-    async periodicCleanDir(cleanConfig) {
+    async periodicCleanDir() {
         try {
             if (!this.remoteSent)
                 this.remoteSent = {};
@@ -338,17 +399,34 @@ class ReaderWorker {
                 }
             }
 
+            let lastCleanDirTime = 0;
+            let lastRemoteSendTime = 0;
             while (1) {// eslint-disable-line no-constant-condition
-
+                //отсылка в удаленное хранилище
-                for (const [remoteDir, config] of Object.entries(cleanConfig)) {
+                if (Date.now() - lastRemoteSendTime >= remoteSendPeriod) {
                     try {
-                        await this.cleanDir(config.dir, remoteDir, config.maxSize, config.moveToRemote);
+                        await this.remoteSendAll();
                     } catch(e) {
                         log(LM_ERR, e.stack);
                     }
+
+                    lastRemoteSendTime = Date.now();
                 }
 
-                await utils.sleep(cleanDirPeriod);
+                //чистка папок
+                if (Date.now() - lastCleanDirTime >= cleanDirPeriod) {
+                    for (const config of Object.values(this.dirConfig)) {
+                        try {
+                            await this.cleanDir(config);
+                        } catch(e) {
+                            log(LM_ERR, e.stack);
+                        }
+                    }
+
+                    lastCleanDirTime = Date.now();
+                }
+
+                await utils.sleep(60*1000);//интервал проверки 1 минута
             }
         } catch (e) {
             log(LM_FATAL, e.message);

server/core/RemoteStorage.js

@@ -10,7 +10,7 @@ class RemoteStorage {
 
         this.accessToken = this.config.accessToken;
 
-        this.wsc = new WebSocketConnection(config.url);
+        this.wsc = new WebSocketConnection(config.url, 10, 30, {rejectUnauthorized: false});
     }
 
     async wsRequest(query) {

server/core/WebSocketConnection.js

@@ -8,10 +8,13 @@ const cleanPeriod = 5*1000;//5 секунд
 
 class WebSocketConnection {
     //messageLifeTime в секундах (проверка каждый cleanPeriod интервал)
-    constructor(url, openTimeoutSecs = 10, messageLifeTimeSecs = 30) {
+    constructor(url, openTimeoutSecs = 10, messageLifeTimeSecs = 30, webSocketOptions = {}) {
         this.WebSocket = (isBrowser ? WebSocket : require('ws'));
         this.url = url;
+        this.webSocketOptions = webSocketOptions;
+
         this.ws = null;
+
         this.listeners = [];
         this.messageQueue = [];
         this.messageLifeTime = messageLifeTimeSecs*1000;
@@ -89,9 +92,9 @@ class WebSocketConnection {
                 if (isBrowser) {
                     const protocol = (window.location.protocol == 'https:' ? 'wss:' : 'ws:');
                     const url = this.url || `${protocol}//${window.location.host}/ws`;
-                    this.ws = new this.WebSocket(url);
+                    this.ws = new this.WebSocket(url, this.webSocketOptions);
                 } else {
-                    this.ws = new this.WebSocket(this.url);
+                    this.ws = new this.WebSocket(this.url, this.webSocketOptions);
                 }
 
                 const onopen = () => {

server/index.js

@@ -1,5 +1,4 @@
 require('tls').DEFAULT_MIN_VERSION = 'TLSv1';
-process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = 0;
 
 const fs = require('fs-extra');
 const argv = require('minimist')(process.argv.slice(2));

server/routes.js

@@ -115,7 +115,7 @@ function initStatic(app, config) {
                 }
             }
         } catch(e) {
-            log(LM_ERR, `Static.restoreRemoteFile: ${e.message}`);
+            log(LM_ERR, `static::restoreRemoteFile ${req.path} > ${e.message}`);
         }
 
         return next();