Работа над BookUpdateChecker

server/config/base.js

@@ -35,7 +35,13 @@ module.exports = {
             dbName: 'reader-storage',
             thread: true,
             openAll: true,
-        }
+        },
+        {
+            serverName: 'buc',
+            dbName: 'book-update-server',
+            thread: true,
+            openAll: true,            
+        },
     ],
 
     servers: [
@@ -45,6 +51,14 @@ module.exports = {
             ip: '0.0.0.0',
             port: '33080',
         },
+        /*{
+            serverName: 'buc',
+            mode: 'book_update_checker', //'none', 'normal', 'site', 'reader', 'omnireader', 'liberama.top', 'book_update_checker'
+            isHttps: true,
+            keysFile: 'server',
+            ip: '0.0.0.0',
+            port: '33443',
+        }*/
     ],
 
     remoteStorage: false,

server/controllers/BookUpdateCheckerController.js

@@ -1,6 +1,7 @@
-const WebSocket = require ('ws');
+const WebSocket = require('ws');
 //const _ = require('lodash');
 
+const BUCServer = require('../core/BookUpdateChecker/BUCServer');
 const log = new (require('../core/AppLogger'))().log;//singleton
 //const utils = require('../core/utils');
 
@@ -13,6 +14,8 @@ class BookUpdateCheckerController {
         this.isDevelopment = (config.branch == 'development');
 
         //this.readerStorage = new JembaReaderStorage();
+        this.bucServer = new BUCServer(config);
+        this.bucServer.main(); //no await
 
         this.wss = wss;
 

server/core/BookUpdateChecker/BUCServer.js

@@ -1,3 +1,9 @@
+const fs = require('fs-extra');
+
+const FileDownloader = require('../FileDownloader');
+
+const log = new (require('../AppLogger'))().log;//singleton
+
 let instance = null;
 
 //singleton
@@ -18,6 +24,15 @@ class BUCServer {
     }    
 
     async main() {
+        try {
+            //
+            
+            log(`---------------------------`);
+            log(`Book Update checker started`);
+            log(`---------------------------`);
+        } catch (e) {
+            log(LM_FATAL, e.stack);
+        }
     }
 }
 

server/db/JembaConnManager.js

@@ -31,7 +31,15 @@ class JembaConnManager {
 
         ayncExit.add(this.close.bind(this));
 
+        const serverNames = new Set();
+        for (const serverCfg of this.config.servers) {
+            serverNames.add(serverCfg.serverName);
+        }
+
         for (const dbConfig of this.config.jembaDb) {
+            if (dbConfig.serverName && !serverNames.has(dbConfig.serverName))
+                continue;
+
             const dbPath = `${this.config.dataDir}/db/${dbConfig.dbName}`;
 
             //бэкап

server/db/jembaMigrations/book-update-server/001-create.js

@@ -1,7 +1,7 @@
 module.exports = {
     up: [
         ['create', {
-            table: 'checked',
+            table: 'buc',
             index: [
                 {field: 'queryTime', type: 'number'},
                 {field: 'checkTime', type: 'number'},
@@ -10,7 +10,7 @@ module.exports = {
     ],    
     down: [
         ['drop', {
-            table: 'checked'
+            table: 'buc'
         }],
     ]
 };

server/index.js

@@ -5,6 +5,7 @@ const argv = require('minimist')(process.argv.slice(2));
 const express = require('express');
 const compression = require('compression');
 const http = require('http');
+const https = require('https');
 const WebSocket = require ('ws');
 
 const ayncExit = new (require('./core/AsyncExit'))();
@@ -57,7 +58,15 @@ async function main() {
     for (let serverCfg of config.servers) {
         if (serverCfg.mode !== 'none') {
             const app = express();
-            const server = http.createServer(app);
+            let server;
+            if (serverCfg.isHttps) {
+                const key = fs.readFileSync(`${config.dataDir}/${serverCfg.keysFile}.key`);
+                const cert = fs.readFileSync(`${config.dataDir}/${serverCfg.keysFile}.crt`);
+
+                server = https.createServer({key, cert}, app);
+            } else {
+                server = http.createServer(app);
+            }
             const wss = new WebSocket.Server({ server, maxPayload: maxPayloadSize*1024*1024 });
 
             const serverConfig = Object.assign({}, config, serverCfg);
@@ -86,7 +95,7 @@ async function main() {
             }
 
             server.listen(serverConfig.port, serverConfig.ip, function() {
-                log(`Server-${serverConfig.serverName} is ready on ${serverConfig.ip}:${serverConfig.port}, mode: ${serverConfig.mode}`);
+                log(`Server "${serverConfig.serverName}" is ready on ${(serverConfig.isHttps ? 'https://' : 'http://')}${serverConfig.ip}:${serverConfig.port}, mode: ${serverConfig.mode}`);
             });
         }
     }