Merge branch 'release/0.12.2-3'

0.12.2-2

build/webpack.base.config.js

@@ -14,6 +14,7 @@ module.exports = {
     entry: [`${clientDir}/main.js`],
     output: {
         publicPath: '/app/',
+        clean: true
     },
 
     module: {

build/webpack.dev.config.js

@@ -16,7 +16,8 @@ module.exports = merge(baseWpConfig, {
     devtool: 'inline-source-map',
     output: {
         path: `${publicDir}/app`,
-        filename: 'bundle.js'
+        filename: 'bundle.js',
+        clean: true
     },
 
     module: {
@@ -38,6 +39,6 @@ module.exports = merge(baseWpConfig, {
             template: `${clientDir}/index.html.template`,
             filename: `${publicDir}/index.html`
         }),
-        new CopyWebpackPlugin({patterns: [{from: `${clientDir}/assets/*`, to: `${publicDir}/`}]})
+        new CopyWebpackPlugin({patterns: [{context: `${clientDir}/assets`, from: `${clientDir}/assets/*`, to: `${publicDir}/`}]})
     ]
 });

build/webpack.prod.config.js

@@ -18,7 +18,8 @@ module.exports = merge(baseWpConfig, {
     mode: 'production',
     output: {
         path: `${publicDir}/app_new`,
-        filename: 'bundle.[contenthash].js'
+        filename: 'bundle.[contenthash].js',
+        clean: true        
     },
     module: {
         rules: [
@@ -54,7 +55,7 @@ module.exports = merge(baseWpConfig, {
             filename: `${publicDir}/index.html`
         }),
         new CopyWebpackPlugin({patterns: 
-            [{from: `${clientDir}/assets/*`, to: `${publicDir}/`, context: `${clientDir}/assets` }]
+            [{context: `${clientDir}/assets`, from: `${clientDir}/assets/*`, to: `${publicDir}/` }]
         }),
         new GenerateSW({
             cacheId: 'liberama',

client/components/App.vue

@@ -271,6 +271,10 @@ body, html, #app {
     font: normal 12pt ReaderDefault;
 }
 
+.notify-margin {
+    margin-top: 55px;
+}
+
 .dborder {
     border: 2px solid magenta !important;
 }

client/components/share/Notify.vue

@@ -27,9 +27,10 @@ class Notify {
             icon,
             actions: [{icon: 'la la-times notify-button-icon', color: 'black'}],
             html: true,
+            classes: 'notify-margin',
 
             message: 
-                `<div style="max-width: 350px;">
+                `<div style="max-width: 350px">
                     ${caption}
                     <div style="color: ${messageColor}; overflow-wrap: break-word; word-wrap: break-word;">${message}</div>
                 </div>`

server/core/FileDownloader.js

@@ -1,3 +1,4 @@
+const https = require('https');
 const axios = require('axios');
 const utils = require('./utils');
 
@@ -16,6 +17,9 @@ class FileDownloader {
                 'user-agent': userAgent,
                 timeout: 300*1000,
             },
+            httpsAgent: new https.Agent({
+                rejectUnauthorized: false // решение проблемы 'unable to verify the first certificate' для некоторых сайтов с валидным сертификатом
+            }),
             responseType: 'stream',
         };
 

server/core/Reader/ReaderWorker.js

@@ -83,6 +83,7 @@ class ReaderWorker {
         let convertFilename = '';
 
         const overLoadMes = 'Слишком большая очередь загрузки. Пожалуйста, попробуйте позже.';
+        const fileNotFoundMes = 'Файл не найден';
         const overLoadErr = new Error(overLoadMes);
 
         let q = null;
@@ -184,26 +185,33 @@ class ReaderWorker {
             })();
 
         } catch (e) {
+            log(LM_ERR, `url: ${url}, downloadedFilename: ${downloadedFilename}`);
             log(LM_ERR, e.stack);
             let mes = e.message.split('|FORLOG|');
             if (mes[1])
                 log(LM_ERR, mes[0] + mes[1]);
-            log(LM_ERR, `downloadedFilename: ${downloadedFilename}`);
 
             mes = mes[0];
             if (mes == 'abort')
                 mes = overLoadMes;
+            if (mes.indexOf('ENOTDIR') >= 0)
+                mes = fileNotFoundMes;
+
             wState.set({state: 'error', error: mes});
         } finally {
             //clean
-            if (q)
+            try {
-                q.ret();
+                if (q)
-            if (decompDir)
+                    q.ret();
-                await fs.remove(decompDir);
+                if (decompDir)
-            if (downloadedFilename && !isUploaded)
+                    await fs.remove(decompDir);
-                await fs.remove(downloadedFilename);
+                if (downloadedFilename && !isUploaded)
-            if (convertFilename)
+                    await fs.remove(downloadedFilename);
-                await fs.remove(convertFilename);
+                if (convertFilename)
+                    await fs.remove(convertFilename);
+            } catch (e) {
+                log(LM_ERR, `Remove error: ${e.stack}`);
+            }
         }
     }