Переход на WebSocket, поправки багов

server/controllers/WebSocketController.js

@@ -71,6 +71,8 @@ class WebSocketController {
                     await this.test(req, ws); break;
                 case 'get-config':
                     await this.getConfig(req, ws); break;
+                case 'load-book':
+                    await this.loadBook(req, ws); break;
                 case 'worker-get-state':
                     await this.workerGetState(req, ws); break;
                 case 'worker-get-state-finish':
@@ -124,6 +126,22 @@ class WebSocketController {
         }
     }
 
+    async loadBook(req, ws) {
+        const workerId = this.readerWorker.loadBookUrl({
+            url: req.url, 
+            enableSitesFilter: (_.has(req, 'enableSitesFilter') ? req.enableSitesFilter : true),
+            skipHtmlCheck: (_.has(req, 'skipHtmlCheck') ? req.skipHtmlCheck : false),
+            isText: (_.has(req, 'isText') ? req.isText : false),
+            uploadFileName: (_.has(req, 'uploadFileName') ? req.uploadFileName : false),
+            djvuQuality: (_.has(req, 'djvuQuality') ? req.djvuQuality : false),
+            pdfAsText: (_.has(req, 'pdfAsText') ? req.pdfAsText : false),
+            pdfQuality: (_.has(req, 'pdfQuality') ? req.pdfQuality : false),
+        });
+        const state = this.workerState.getState(workerId);
+
+        this.send((state ? state : {}), req, ws);
+    }
+
     async workerGetState(req, ws) {
         if (!req.workerId)
             throw new Error(`key 'workerId' is wrong`);

server/routes.js

@@ -6,25 +6,30 @@ const multer = require('multer');
 const ReaderWorker = require('./core/Reader/ReaderWorker');//singleton
 const log = new (require('./core/AppLogger'))().log;//singleton
 
-const c = require('./controllers');
+const {
+    ReaderController,
+    WebSocketController,
+    BookUpdateCheckerController,
+} = require('./controllers');
+
 const utils = require('./core/utils');
 
 function initRoutes(app, wss, config) {
     //эксклюзив для update_checker
     if (config.mode === 'book_update_checker') {
-        new c.BookUpdateCheckerController(wss, config);
+        new BookUpdateCheckerController(wss, config);
         return;
     }
 
     initStatic(app, config);
         
-    const reader = new c.ReaderController(config);
-    new c.WebSocketController(wss, config);
+    const reader = new ReaderController(config);
+    new WebSocketController(wss, config);
 
     //multer
     const storage = multer.diskStorage({
         destination: (req, file, cb) => {
-            cb(null, config.uploadDir);
+            cb(null, config.uploadPublicDir);
         },
         filename: (req, file, cb) => {
             cb(null, utils.randomHexString(30));
@@ -40,7 +45,7 @@ function initRoutes(app, wss, config) {
     //to app
     for (let route of routes) {
         let callbacks = [];
-        let [httpMethod, path, controllers] = route;
+        let [httpMethod, actionPath, controllers] = route;
         let controller = controllers;
         if (Array.isArray(controllers)) {
             controller = controllers[controllers.length - 1];
@@ -61,10 +66,10 @@ function initRoutes(app, wss, config) {
 
         switch (httpMethod) {
             case 'GET' :
-                app.get(path, ...callbacks);
+                app.get(actionPath, ...callbacks);
                 break;
             case 'POST':
-                app.post(path, ...callbacks);
+                app.post(actionPath, ...callbacks);
                 break;
             default: 
                 throw new Error(`initRoutes error: unknown httpMethod: ${httpMethod}`);