Merge branch 'release/0.8.2-2'

0.8.2-1

README.md

@@ -11,6 +11,7 @@
 Для разворачивания читалки на чистом VPS с нуля смотрите [docs/omnireader](docs/omnireader/README.md)
 
 ## Сборка проекта
+Необходима версия node.js не ниже 10.
 
 ```
 $ git clone https://github.com/bookpauk/liberama

client/api/reader.js

@@ -1,7 +1,5 @@
 import axios from 'axios';
 
-import * as utils from '../share/utils';
-
 const api = axios.create({
     baseURL: '/api/reader'
 });
@@ -11,8 +9,50 @@ const workerApi = axios.create({
 });
 
 class Reader {
+
+    async getStateFinish(workerId, callback) {
+        if (!callback) callback = () => {};
+
+        //присылается текст, состоящий из json-объектов state каждые 300ms, с разделителем splitter между ними
+        const splitter = '-- aod2t5hDXU32bUFyqlFE next status --';
+        let lastIndex = 0;
+        let response = await workerApi.post('/get-state-finish', {workerId}, {
+            onDownloadProgress: progress => {
+                //небольая оптимизация, вместо простого responseText.split
+                const xhr = progress.target;
+                let currIndex = xhr.responseText.length;
+                if (lastIndex == currIndex)
+                    return; 
+                const last = xhr.responseText.substring(lastIndex, currIndex);
+                lastIndex = currIndex;
+
+                //быстрее будет last.split
+                const res = last.split(splitter).pop();
+                if (res) {
+                    try {
+                        callback(JSON.parse(res));
+                    } catch (e) {
+                        //
+                    }
+                }
+            }
+        });
+
+        //берем последний state
+        response = response.data.split(splitter).pop();
+
+        if (response) {
+            try {
+                response = JSON.parse(response);
+            } catch (e) {
+                response = false;
+            }
+        }
+
+        return response;
+    }
+
     async loadBook(opts, callback) {
-        const refreshPause = 300;
         if (!callback) callback = () => {};
 
         let response = await api.post('/load-book', opts);
@@ -22,53 +62,98 @@ class Reader {
             throw new Error('Неверный ответ api');
 
         callback({totalSteps: 4});
+        callback(response.data);
 
-        let i = 0;
-        while (1) {// eslint-disable-line no-constant-condition
-            callback(response.data);
+        response = await this.getStateFinish(workerId, callback);
 
-            if (response.data.state == 'finish') {//воркер закончил работу, можно скачивать кешированный на сервере файл
+        if (response) {
+            if (response.state == 'finish') {//воркер закончил работу, можно скачивать кешированный на сервере файл
                 callback({step: 4});
-                const book = await this.loadCachedBook(response.data.path, callback);
-                return Object.assign({}, response.data, {data: book.data});
+                const book = await this.loadCachedBook(response.path, callback, false, (response.size ? response.size : -1));
+                return Object.assign({}, response, {data: book.data});
             }
-            if (response.data.state == 'error') {
-                let errMes = response.data.error;
+
+            if (response.state == 'error') {
+                let errMes = response.error;
                 if (errMes.indexOf('getaddrinfo') >= 0 || 
                     errMes.indexOf('ECONNRESET') >= 0 ||
                     errMes.indexOf('EINVAL') >= 0 ||
                     errMes.indexOf('404') >= 0)
-                    errMes = `Ресурс не найден по адресу: ${response.data.url}`;
+                    errMes = `Ресурс не найден по адресу: ${response.url}`;
                 throw new Error(errMes);
             }
-            if (i > 0)
-                await utils.sleep(refreshPause);
-
-            i++;
-            if (i > 120*1000/refreshPause) {//2 мин ждем телодвижений воркера
-                throw new Error('Слишком долгое время ожидания');
-            }
-            //проверка воркера
-            const prevProgress = response.data.progress;
-            const prevState = response.data.state;
-            response = await workerApi.post('/get-state', {workerId});
-            i = (prevProgress != response.data.progress || prevState != response.data.state ? 1 : i);
+        } else {
+            throw new Error('Пустой ответ сервера');
         }
     }
 
     async checkUrl(url) {
-        return await axios.head(url, {headers: {'Cache-Control': 'no-cache'}});
-    }
-
-    async loadCachedBook(url, callback) {
-        const response = await axios.head(url);
-
-        let estSize = 1000000;
-        if (response.headers['content-length']) {
-            estSize = response.headers['content-length'];
+        let fileExists = false;
+        try {
+            await axios.head(url, {headers: {'Cache-Control': 'no-cache'}});
+            fileExists = true;
+        } catch (e) {
+            //
         }
 
+        //восстановим при необходимости файл на сервере из удаленного облака
+        if (!fileExists) {
+            let response = await api.post('/restore-cached-file', {path: url});
+
+            const workerId = response.data.workerId;
+            if (!workerId)
+                throw new Error('Неверный ответ api');
+
+            response = await this.getStateFinish(workerId);
+            if (response.state == 'error') {
+                throw new Error(response.error);
+            }
+        }
+
+        return true;
+    }
+
+    async loadCachedBook(url, callback, restore = true, estSize = -1) {
+        if (!callback) callback = () => {};
+        let response = null;
+
         callback({state: 'loading', progress: 0});
+
+        //получение размера файла
+        let fileExists = false;
+        if (estSize < 0) {
+            try {
+                response = await axios.head(url, {headers: {'Cache-Control': 'no-cache'}});
+
+                if (response.headers['content-length']) {
+                    estSize = response.headers['content-length'];
+                }
+                fileExists = true;
+            } catch (e) {
+                //
+            }
+        }
+
+        //восстановим при необходимости файл на сервере из удаленного облака
+        if (restore && !fileExists) {
+            response = await api.post('/restore-cached-file', {path: url});
+
+            const workerId = response.data.workerId;
+            if (!workerId)
+                throw new Error('Неверный ответ api');
+
+            response = await this.getStateFinish(workerId);
+            if (response.state == 'error') {
+                throw new Error(response.error);
+            }
+
+            if (response.size && estSize < 0) {
+                estSize = response.size;
+            }
+        }
+
+        //получение файла
+        estSize = (estSize > 0 ? estSize : 1000000);
         const options = {
             onDownloadProgress: progress => {
                 while (progress.loaded > estSize) estSize *= 1.5;
@@ -77,7 +162,7 @@ class Reader {
                     callback({progress: Math.round((progress.loaded*100)/estSize)});
             }
         }
-        //загрузка
+
         return await axios.get(url, options);
     }
 

client/components/Reader/LoaderPage/GithubCorner/GithubCorner.vue

@@ -0,0 +1,128 @@
+<template>
+  <div id="vue-github-corner">
+    <a  :href="url" id="github-corner" target="_blank" aria-label="View source on Github" >
+      <svg  id="github-corner-svg"
+            aria-hidden="true"
+            viewBox="0 0 250 250" 
+            :width="size" :height="size"
+            :style="svgStyle" >
+        <path :d="svgPath1" @mouseenter="flipColor" @mouseleave="flipColor"></path>
+        <path :d="svgPath2" :style="gitStyle" class="octo-arm"></path>
+        <path :d="svgPath3" :style="gitStyle" class="octo-body"></path>
+      </svg>
+    </a>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'GithubCorner',
+    props: {
+      url: {
+        type: String,
+        default: '/'
+      },
+      size: {
+        type: Number,
+        default: 80
+      },
+      colorScheme: {
+        type: String,
+        default: 'auto'
+      },
+      cornerColor: {
+        type: String, 
+        default: '#625D5D'
+      },
+      gitColor: {
+        type: String,
+        default: 'PeachPuff'
+      },
+      leftCorner: {
+        type: Boolean,
+        default: false
+      },
+      flipOnHover: {
+        type: Boolean,
+        default: false
+      }
+    },
+    data () {
+      return {
+        svgStyle: {
+          fill: this.cornerColor,
+          right: (this.leftCorner ? 'auto' : '0'),
+          left: (this.leftCorner ? '0' : 'auto'),
+          transform: (this.leftCorner ? 'scale(-1, 1)' : 'none')
+        },
+        gitStyle: {
+          fill: this.gitColor
+        },
+        flipped: false,
+        svgPath1: 'M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z',
+        svgPath2: 'M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2',
+        svgPath3: 'M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z'
+      }
+    },
+    methods: {
+      flipColor: function() {
+        if (this.flipOnHover) {
+          let holdSvgFill = this.svgStyle.fill
+          this.svgStyle.fill = this.gitStyle.fill
+          this.gitStyle.fill = holdSvgFill
+        }
+      }
+    },
+    beforeMount: function() {
+      if (this.colorScheme != 'auto') {
+        let sch = this.colorScheme
+        this.gitStyle.fill = '#fff'
+
+        if (sch.toLowerCase() == 'black') {
+          this.svgStyle.fill = '#151513'
+        } 
+        if (sch.toLowerCase() == 'green') {
+          this.svgStyle.fill = '#64CEAA'
+        }
+        if (sch.toLowerCase() == 'red') {
+          this.svgStyle.fill = '#FD6C6C'
+        }
+        if (sch.toLowerCase() == 'blue') {
+          this.svgStyle.fill = '#70B7FD'
+        }
+        if (sch.toLowerCase() == 'white') {
+          this.svgStyle.fill = '#fff'
+          this.gitStyle.fill = '#151513'
+        }
+      }
+    }
+  }
+</script>
+
+<style>
+  #github-corner .octo-arm {
+    transform-origin: 130px 106px
+  }
+  #github-corner:hover .octo-arm {
+    animation: octocat-wave 560ms ease-in-out;
+  }
+
+  @keyframes octocat-wave {
+    0% { transform: rotate(0deg); }
+    20% { transform: rotate(-25deg); }
+    40% { transform: rotate(10deg); }
+    60% { transform: rotate(-25deg); }
+    80% { transform: rotate(10deg); }
+    100% { transform: rotate(0deg); }
+  }
+
+  #github-corner-svg {
+    color: #fff;
+    position: absolute;
+    top: 0;
+    border: 0;
+  }
+    #github-corner-svg, #github-corner-svg .octo-arm, #github-corner-svg .octo-body {
+      transition: fill 1s ease;
+    }
+</style>

client/components/Reader/LoaderPage/LoaderPage.vue

@@ -1,5 +1,6 @@
 <template>
     <div ref="main" class="main">
+        <GithubCorner url="https://github.com/bookpauk/liberama" cornerColor="#1B695F"></GithubCorner>
         <div class="part top">
             <span class="greeting bold-font">{{ title }}</span>
             <div class="space"></div>
@@ -54,11 +55,14 @@
 //-----------------------------------------------------------------------------
 import Vue from 'vue';
 import Component from 'vue-class-component';
+import GithubCorner from './GithubCorner/GithubCorner.vue';
+
 import PasteTextPage from './PasteTextPage/PasteTextPage.vue';
 import {versionHistory} from '../versionHistory';
 
 export default @Component({
     components: {
+        GithubCorner,
         PasteTextPage,
     },
 })
@@ -108,7 +112,7 @@ class LoaderPage extends Vue {
 
     submitUrl() {
         if (this.bookUrl) {
-            this.$emit('load-book', {url: this.bookUrl});
+            this.$emit('load-book', {url: this.bookUrl, force: true});
             this.bookUrl = '';
         }
     }

client/components/Reader/Reader.vue

@@ -824,7 +824,8 @@ class Reader extends Vue {
             return;
         }
 
-        let url = opts.url;
+        let url = encodeURI(decodeURI(opts.url));
+
         if ((url.indexOf('http://') != 0) && (url.indexOf('https://') != 0) &&
             (url.indexOf('file://') != 0))
             url = 'http://' + url;

client/components/Reader/TextPage/TextPage.vue

@@ -225,30 +225,23 @@ class TextPage extends Vue {
 
         //scrolling page
         const pageSpace = this.scrollHeight - this.pageLineCount*this.lineHeight;
-        let y = pageSpace/2;
+        let top = pageSpace/2;
         if (this.showStatusBar)
-            y += this.statusBarHeight*(this.statusBarTop ? 1 : 0);
-        let page1 = this.$refs.scrollBox1;
-        let page2 = this.$refs.scrollBox2;
+            top += this.statusBarHeight*(this.statusBarTop ? 1 : 0);
+        let page1 = this.$refs.scrollBox1.style;
+        let page2 = this.$refs.scrollBox2.style;
         
-        page1.style.perspective = '3072px';
-        page2.style.perspective = '3072px';
+        page1.perspective = page2.perspective = '3072px';
 
-        page1.style.width = this.w + this.indentLR + 'px';
-        page2.style.width = this.w + this.indentLR + 'px';
-        page1.style.height = this.scrollHeight - (pageSpace > 0 ? pageSpace : 0) + 'px';
-        page2.style.height = this.scrollHeight - (pageSpace > 0 ? pageSpace : 0) + 'px';
-        page1.style.top = y + 'px';
-        page2.style.top = y + 'px';
-        page1.style.left = this.indentLR + 'px';
-        page2.style.left = this.indentLR + 'px';
+        page1.width = page2.width = this.w + this.indentLR + 'px';
+        page1.height = page2.height = this.scrollHeight - (pageSpace > 0 ? pageSpace : 0) + 'px';
+        page1.top = page2.top = top + 'px';
+        page1.left = page2.left = this.indentLR + 'px';
 
-        page1 = this.$refs.scrollingPage1;
-        page2 = this.$refs.scrollingPage2;
-        page1.style.width = this.w + this.indentLR + 'px';
-        page2.style.width = this.w + this.indentLR + 'px';
-        page1.style.height = this.scrollHeight + this.lineHeight + 'px';
-        page2.style.height = this.scrollHeight + this.lineHeight + 'px';
+        page1 = this.$refs.scrollingPage1.style;
+        page2 = this.$refs.scrollingPage2.style;
+        page1.width = page2.width = this.w + this.indentLR + 'px';
+        page1.height = page2.height = this.scrollHeight + this.lineHeight + 'px';
     }
 
     async checkLoadedFonts() {

client/components/Reader/versionHistory.js

@@ -1,6 +1,29 @@
 export const versionHistory = [
 {
-    showUntil: '2020-01-15',
+    showUntil: '2020-01-19',
+    header: '0.8.2 (2020-01-20)',
+    content:
+`
+<ul>
+    <li>внутренние оптимизации</li>
+</ul>
+`
+},
+
+{
+    showUntil: '2020-01-06',
+    header: '0.8.1 (2020-01-07)',
+    content:
+`
+<ul>
+    <li>добавлена частичная поддержка формата FB3</li>
+    <li>исправлен баг "Request path contains unescaped characters"</li>
+</ul>
+`
+},
+
+{
+    showUntil: '2020-01-05',
     header: '0.8.0 (2020-01-02)',
     content:
 `

docs/omnireader/README.md

@@ -9,7 +9,7 @@ git clone https://github.com/bookpauk/liberama
 ### node.js
 ```
 sudo apt install -y curl
-curl -sL https://deb.nodesource.com/setup_10.x | sudo bash -
+curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
 sudo apt install -y nodejs
 ```
 
@@ -39,6 +39,8 @@ sudo apt install poppler-utils
 ```
 
 ### nginx, server config
+Для своего домена необходимо будет подправить docs/omnireader/omnireader.
+Можно также настроить сервер для HTTP, без SSL.
 ```
 sudo apt install nginx
 sudo cp docs/omnireader/omnireader /etc/nginx/sites-available/omnireader
@@ -48,6 +50,8 @@ sudo service nginx reload
 sudo chown -R www-data.www-data /var/www
 ```
 
+### certbot
+Следовать инструкции установки certbot https://certbot.eff.org/lets-encrypt/ubuntubionic-nginx
 ### old.omnireader 
 ```
 sudo apt install php7.2 php7.2-curl php7.2-mbstring php7.2-fpm
@@ -61,8 +65,8 @@ sudo -u www-data cp -r docs/omnireader/old/* /home/oldreader
 ## Деплой и запуск
 ```
 cd docs/omnireader
-sh deploy.sh
-sh run_server.sh
+./deploy.sh
+./run_server.sh
 ```
 
 После первого запуска будет создан конфигурационный файл `/home/liberama/data/config.json`.

docs/omnireader/deploy.sh

@@ -1,2 +1,4 @@
+#!/bin/sh
+
 npm run build:linux
 sudo -u www-data cp -r ../../dist/linux/* /home/liberama

docs/omnireader/run_server.sh

@@ -1 +1,3 @@
+#!/bin/sh
+
 sudo -H -u www-data sh -c "cd /var/www; /home/liberama/liberama"

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "Liberama",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1725,6 +1725,11 @@
         }
       }
     },
+    "base-64": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/base-64/-/base-64-0.1.0.tgz",
+      "integrity": "sha1-eAqZyE59YAJgNhURxId2E78k9rs="
+    },
     "base-x": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.7.tgz",
@@ -3610,12 +3615,6 @@
         "path-type": "^3.0.0"
       }
     },
-    "disable-output-webpack-plugin": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/disable-output-webpack-plugin/-/disable-output-webpack-plugin-1.0.1.tgz",
-      "integrity": "sha512-fT4qiosyTqteTKDbYLXISMKzMVbl2dMXbMpUN3VPAUxX9JL81MmOilisbX555W1XS4B6FRzQt9zMtqg1T6Jx9Q==",
-      "dev": true
-    },
     "doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -4179,12 +4178,6 @@
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
       "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
     },
-    "event-hooks-webpack-plugin": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/event-hooks-webpack-plugin/-/event-hooks-webpack-plugin-2.1.4.tgz",
-      "integrity": "sha512-TmxHNmRHPIG4XVDtAKT6i/rXNTAR6EnFQlSVsBFMkQ1f0MT2Me9RBNLw4E1JvdH433ag1VF9tPkp5sjTOfZM4Q==",
-      "dev": true
-    },
     "events": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
@@ -5731,6 +5724,11 @@
         "parse-passwd": "^1.0.0"
       }
     },
+    "hot-patcher": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/hot-patcher/-/hot-patcher-0.5.0.tgz",
+      "integrity": "sha512-2Uu2W0s8+dnqXzdlg0MRsRzPoDCs1wVjOGSyMRRaMzLDX4bgHw6xDYKccsWafXPPxQpkQfEjgW6+17pwcg60bw=="
+    },
     "hsl-regex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
@@ -6914,6 +6912,11 @@
         }
       }
     },
+    "merge": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
+      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="
+    },
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -7500,12 +7503,6 @@
         "boolbase": "~1.0.0"
       }
     },
-    "null-loader": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/null-loader/-/null-loader-0.1.1.tgz",
-      "integrity": "sha1-F76av80/8OFRL2/Er8sfUDk3j64=",
-      "dev": true
-    },
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
@@ -7900,6 +7897,11 @@
       "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
       "dev": true
     },
+    "path-posix": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/path-posix/-/path-posix-1.0.0.tgz",
+      "integrity": "sha1-BrJhE/Vr6rBCVFojv6iAA8ysJg8="
+    },
     "path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
@@ -10441,6 +10443,11 @@
       "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
       "dev": true
     },
+    "querystringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="
+    },
     "randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -10727,6 +10734,11 @@
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
       "dev": true
     },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
+    },
     "resize-observer-polyfill": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
@@ -12507,6 +12519,11 @@
         }
       }
     },
+    "url-join": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
+      "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA=="
+    },
     "url-loader": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-1.1.2.tgz",
@@ -12526,6 +12543,15 @@
         }
       }
     },
+    "url-parse": {
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
+      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "requires": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
     "url-parse-lax": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
@@ -12755,6 +12781,32 @@
         "neo-async": "^2.5.0"
       }
     },
+    "webdav": {
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/webdav/-/webdav-2.10.1.tgz",
+      "integrity": "sha512-3UfnjGTAqSM9MW3Rpt1KrY1KneYK0wPCFryHTncqw1OP1pyiniT3uYhVpgmH6za/TkWOfnTnKCDKhwrLJFdzow==",
+      "requires": {
+        "axios": "^0.19.0",
+        "base-64": "^0.1.0",
+        "hot-patcher": "^0.5.0",
+        "merge": "^1.2.1",
+        "minimatch": "^3.0.4",
+        "path-posix": "^1.0.0",
+        "url-join": "^4.0.1",
+        "url-parse": "^1.4.7",
+        "xml2js": "^0.4.19"
+      },
+      "dependencies": {
+        "axios": {
+          "version": "0.19.1",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.1.tgz",
+          "integrity": "sha512-Yl+7nfreYKaLRvAvjNPkvfjnQHJM1yLBY3zhqAwcJSwR/6ETkanUgylgtIvkvz0xJ+p/vZuNw8X7Hnb7Whsbpw==",
+          "requires": {
+            "follow-redirects": "1.5.10"
+          }
+        }
+      }
+    },
     "webpack": {
       "version": "4.40.2",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.40.2.tgz",
@@ -13023,6 +13075,20 @@
         "mkdirp": "^0.5.1"
       }
     },
+    "xml2js": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "requires": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      }
+    },
+    "xmlbuilder": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
+    },
     "xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Liberama",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "author": "Book Pauk <bookpauk@gmail.com>",
   "license": "CC0-1.0",
   "repository": "bookpauk/liberama",
@@ -32,17 +32,14 @@
     "clean-webpack-plugin": "^1.0.1",
     "copy-webpack-plugin": "^5.1.1",
     "css-loader": "^1.0.0",
-    "disable-output-webpack-plugin": "^1.0.1",
     "element-theme-chalk": "^2.12.0",
     "eslint": "^5.16.0",
     "eslint-plugin-html": "^5.0.5",
     "eslint-plugin-node": "^8.0.0",
     "eslint-plugin-vue": "^5.2.3",
-    "event-hooks-webpack-plugin": "^2.1.4",
     "file-loader": "^3.0.1",
     "html-webpack-plugin": "^3.2.0",
     "mini-css-extract-plugin": "^0.5.0",
-    "null-loader": "^0.1.1",
     "optimize-css-assets-webpack-plugin": "^5.0.3",
     "pkg": "^4.4.2",
     "terser-webpack-plugin": "^1.4.1",
@@ -87,6 +84,7 @@
     "vue-router": "^3.1.3",
     "vuex": "^3.1.1",
     "vuex-persistedstate": "^2.5.4",
+    "webdav": "^2.10.1",
     "zip-stream": "^2.1.2"
   }
 }

server/config/base.js

@@ -21,7 +21,7 @@ module.exports = {
     maxTempPublicDirSize: 512*1024*1024,//512Мб
     maxUploadPublicDirSize: 200*1024*1024,//100Мб
 
-    useExternalBookConverter: false,
+    useExternalBookConverter: false,    
 
     db: [
         {
@@ -45,5 +45,14 @@ module.exports = {
         },
     ],
 
+    remoteWebDavStorage: false,
+    /*
+    remoteWebDavStorage: {
+        url: '127.0.0.1:1900',
+        username: '',
+        password: '',
+    },
+    */
+
 };
 

server/config/index.js

@@ -10,6 +10,7 @@ const propsToSave = [
     'useExternalBookConverter',
     
     'servers',
+    'remoteWebDavStorage',
 ];
 
 let instance = null;

server/controllers/ReaderController.js

@@ -62,6 +62,24 @@ class ReaderController extends BaseController {
         res.status(400).send({error});
         return false;
     }
+
+    async restoreCachedFile(req, res) {
+        const request = req.body;
+        let error = '';
+        try {
+            if (!request.path) 
+                throw new Error(`key 'path' is empty`);
+
+            const workerId = this.readerWorker.restoreCachedFile(request.path);
+            const state = this.workerState.getState(workerId);
+            return (state ? state : {});
+        } catch (e) {
+            error = e.message;
+        }
+        //bad request
+        res.status(400).send({error});
+        return false;
+    }
 }
 
 module.exports = ReaderController;

server/controllers/WorkerController.js

@@ -1,5 +1,6 @@
 const BaseController = require('./BaseController');
 const WorkerState = require('../core/WorkerState');//singleton
+const utils = require('../core/utils');
 
 class WorkerController extends BaseController {
     constructor(config) {
@@ -15,6 +16,7 @@ class WorkerController extends BaseController {
                 throw new Error(`key 'workerId' is wrong`);
 
             const state = this.workerState.getState(request.workerId);
+
             return (state ? state : {});
         } catch (e) {
             error = e.message;
@@ -23,6 +25,59 @@ class WorkerController extends BaseController {
         res.status(400).send({error});
         return false;
     }
+
+    async getStateFinish(req, res) {
+        const request = req.body;
+        let error = '';
+        try {
+            if (!request.workerId)
+                throw new Error(`key 'workerId' is wrong`);
+
+            res.writeHead(200, {
+                'Content-Type': 'text/json; charset=utf-8',
+            });
+
+            const splitter = '-- aod2t5hDXU32bUFyqlFE next status --';            
+            const refreshPause = 200;
+            let i = 0;
+            let prevProgress = -1;
+            let prevState = '';
+            let state;
+            while (1) {// eslint-disable-line no-constant-condition
+                state = this.workerState.getState(request.workerId);
+                if (!state) break;
+
+                res.write(splitter + JSON.stringify(state));
+                res.flush();
+
+                if (state.state != 'finish' && state.state != 'error')
+                    await utils.sleep(refreshPause);
+                else
+                    break;
+
+                i++;
+                if (i > 2*60*1000/refreshPause) {//2 мин ждем телодвижений воркера
+                    res.write(splitter + JSON.stringify({state: 'error', error: 'Слишком долгое время ожидания'}));
+                    break;
+                }
+                i = (prevProgress != state.progress || prevState != state.state ? 1 : i);
+                prevProgress = state.progress;
+                prevState = state.state;
+            }
+            
+            if (!state) {
+                res.write(splitter + JSON.stringify({}));
+            }
+
+            res.end();
+            return false;
+        } catch (e) {
+            error = e.message;
+        }
+        //bad request
+        res.status(400).send({error});
+        return false;
+    }
 }
 
 module.exports = WorkerController;

server/core/FileDecompressor.js

@@ -5,6 +5,7 @@ const unbzip2Stream = require('unbzip2-stream');
 const tar = require('tar-fs');
 const ZipStreamer = require('./ZipStreamer');
 
+const appLogger = new (require('./AppLogger'))();//singleton
 const utils = require('./utils');
 const FileDetector = require('./FileDetector');
 
@@ -189,9 +190,9 @@ class FileDecompressor {
         });
     }
 
-    async gzipFile(inputFile, outputFile) {
+    async gzipFile(inputFile, outputFile, level = 1) {
         return new Promise((resolve, reject) => {
-            const gzip = zlib.createGzip({level: 1});
+            const gzip = zlib.createGzip({level});
             const input = fs.createReadStream(inputFile);
             const output = fs.createWriteStream(outputFile);
 
@@ -208,7 +209,21 @@ class FileDecompressor {
         const outFilename = `${outDir}/${hash}`;
 
         if (!await fs.pathExists(outFilename)) {
-            await this.gzipFile(filename, outFilename);
+            await this.gzipFile(filename, outFilename, 1);
+
+            // переупакуем через некоторое время на максималках
+            const filenameCopy = `${filename}.copy`;
+            await fs.copy(filename, filenameCopy);
+
+            (async() => {
+                await utils.sleep(5000);
+                const filenameGZ = `${filename}.gz`;
+                await this.gzipFile(filenameCopy, filenameGZ, 9);
+
+                await fs.move(filenameGZ, outFilename, {overwrite: true});
+
+                await fs.remove(filenameCopy);
+            })().catch((e) => { if (appLogger.inited) appLogger.log(LM_ERR, `FileDecompressor.gzipFileIfNotExists: ${e.message}`) });
         } else {
             await utils.touchFile(outFilename);
         }

server/core/Reader/BookConverter/ConvertDocX.js

@@ -4,14 +4,15 @@ const path = require('path');
 const ConvertBase = require('./ConvertBase');
 
 class ConvertDocX extends ConvertBase {
-    check(data, opts) {
+    async check(data, opts) {
         const {inputFiles} = opts;
         if (this.config.useExternalBookConverter && 
             inputFiles.sourceFileType && inputFiles.sourceFileType.ext == 'zip') {
             //ищем файл '[Content_Types].xml'
             for (const file of inputFiles.files) {
                 if (file.path == '[Content_Types].xml') {
-                    return true;
+                    const contentTypes = await fs.readFile(`${inputFiles.filesDir}/${file.path}`, 'utf8');
+                    return contentTypes.indexOf('/word/document.xml') >= 0;
                 }
             }
         }
@@ -30,7 +31,7 @@ class ConvertDocX extends ConvertBase {
     }
 
     async run(data, opts) {
-        if (!this.check(data, opts))
+        if (!(await this.check(data, opts)))
             return false;
         await this.checkExternalConverterPresent();
 

server/core/Reader/BookConverter/ConvertFb3.js

@@ -0,0 +1,51 @@
+const fs = require('fs-extra');
+
+const ConvertHtml = require('./ConvertHtml');
+
+class ConvertDocX extends ConvertHtml {
+    async check(data, opts) {
+        const {inputFiles} = opts;
+        if (this.config.useExternalBookConverter && 
+            inputFiles.sourceFileType && inputFiles.sourceFileType.ext == 'zip') {
+            //ищем файл '[Content_Types].xml'
+            for (const file of inputFiles.files) {
+                if (file.path == '[Content_Types].xml') {
+                    const contentTypes = await fs.readFile(`${inputFiles.filesDir}/${file.path}`, 'utf8');
+                    return contentTypes.indexOf('/fb3/body.xml') >= 0;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    getTitle(text) {
+        let title = '';
+        const m = text.match(/<title>([\s\S]*?)<\/title>/);
+        if (m)
+            title = m[1];
+
+        return title.trim();
+    }
+
+    async run(data, opts) {
+        if (!(await this.check(data, opts)))
+            return false;
+
+        const {inputFiles} = opts;
+
+        let text = await fs.readFile(`${inputFiles.filesDir}/fb3/body.xml`, 'utf8');
+
+        const title = this.getTitle(text)
+            .replace(/<\/?p>/g, '')
+        ;
+        text = `<title>${title}</title>` + text
+            .replace(/<title>/g, '<br><b>')
+            .replace(/<\/title>/g, '</b><br>')
+            .replace(/<subtitle>/g, '<br><br><subtitle>')
+        ;
+        return await super.run(Buffer.from(text), {skipCheck: true, cutTitle: true});
+    }
+}
+
+module.exports = ConvertDocX;

server/core/Reader/BookConverter/index.js

@@ -7,6 +7,7 @@ const convertClassFactory = [
     require('./ConvertPdf'),
     require('./ConvertRtf'),
     require('./ConvertDocX'),
+    require('./ConvertFb3'),
     require('./ConvertDoc'),
     require('./ConvertMobi'),
     require('./ConvertFb2'),

server/core/Reader/ReaderWorker.js

@@ -5,10 +5,13 @@ const WorkerState = require('../WorkerState');//singleton
 const FileDownloader = require('../FileDownloader');
 const FileDecompressor = require('../FileDecompressor');
 const BookConverter = require('./BookConverter');
+const RemoteWebDavStorage = require('../RemoteWebDavStorage');
 
 const utils = require('../utils');
 const log = new (require('../AppLogger'))().log;//singleton
 
+const cleanDirPeriod = 60*60*1000;//1 раз в час
+
 let instance = null;
 
 //singleton
@@ -28,8 +31,15 @@ class ReaderWorker {
             this.decomp = new FileDecompressor();
             this.bookConverter = new BookConverter(this.config);
 
-            this.periodicCleanDir(this.config.tempPublicDir, this.config.maxTempPublicDirSize, 60*60*1000);//1 раз в час
-            this.periodicCleanDir(this.config.uploadDir, this.config.maxUploadPublicDirSize, 60*60*1000);//1 раз в час
+            this.remoteWebDavStorage = false;
+            if (config.remoteWebDavStorage) {
+                this.remoteWebDavStorage = new RemoteWebDavStorage(
+                    Object.assign({maxContentLength: config.maxUploadFileSize}, config.remoteWebDavStorage)
+                );
+            }
+
+            this.periodicCleanDir(this.config.tempPublicDir, this.config.maxTempPublicDirSize, cleanDirPeriod);
+            this.periodicCleanDir(this.config.uploadDir, this.config.maxUploadPublicDirSize, cleanDirPeriod);
             
             instance = this;
         }
@@ -39,7 +49,6 @@ class ReaderWorker {
 
     async loadBook(opts, wState) {
         const url = opts.url;
-        let errMes = '';
         let decompDir = '';
         let downloadedFilename = '';
         let isUploaded = false;
@@ -87,17 +96,31 @@ class ReaderWorker {
             });
 
             //сжимаем файл в tmp, если там уже нет с тем же именем-sha256
-            const compFilename = await this.decomp.gzipFileIfNotExists(convertFilename, `${this.config.tempPublicDir}`);
+            const compFilename = await this.decomp.gzipFileIfNotExists(convertFilename, this.config.tempPublicDir);
+            const stat = await fs.stat(compFilename);
 
             wState.set({progress: 100});
 
             //finish
             const finishFilename = path.basename(compFilename);
-            wState.finish({path: `/tmp/${finishFilename}`});
+            wState.finish({path: `/tmp/${finishFilename}`, size: stat.size});
+
+            //лениво сохраним compFilename в удаленном хранилище
+            if (this.remoteWebDavStorage) {
+                (async() => {
+                    await utils.sleep(20*1000);
+                    try {
+                        //log(`remoteWebDavStorage.putFile ${path.basename(compFilename)}`);
+                        await this.remoteWebDavStorage.putFile(compFilename);
+                    } catch (e) {
+                        log(LM_ERR, e.stack);
+                    }
+                })();
+            }
 
         } catch (e) {
             log(LM_ERR, e.stack);
-            wState.set({state: 'error', error: (errMes ? errMes : e.message)});
+            wState.set({state: 'error', error: e.message});
         } finally {
             //clean
             if (decompDir)
@@ -133,6 +156,41 @@ class ReaderWorker {
         return `file://${hash}`;
     }
 
+    restoreCachedFile(filename) {
+        const workerId = this.workerState.generateWorkerId();
+        const wState = this.workerState.getControl(workerId);
+        wState.set({state: 'start'});
+
+        (async() => {
+            try {
+                wState.set({state: 'download', step: 1, totalSteps: 1, path: filename, progress: 0});
+
+                const basename = path.basename(filename);
+                const targetName = `${this.config.tempPublicDir}/${basename}`;
+
+                if (!await fs.pathExists(targetName)) {
+                    let found = false;
+                    if (this.remoteWebDavStorage) {
+                        found = await this.remoteWebDavStorage.getFileSuccess(targetName);
+                    } 
+
+                    if (!found) {
+                        throw new Error('404 Файл не найден');
+                    }
+                }
+
+                const stat = await fs.stat(targetName);
+                wState.finish({path: `/tmp/${basename}`, size: stat.size, progress: 100});
+            } catch (e) {
+                if (e.message.indexOf('404') < 0)
+                    log(LM_ERR, e.stack);
+                wState.set({state: 'error', error: e.message});
+            }
+        })();
+
+        return workerId;
+    }
+
     async periodicCleanDir(dir, maxSize, timeout) {
         try {
             const list = await fs.readdir(dir);
@@ -153,7 +211,19 @@ class ReaderWorker {
             let i = 0;
             while (i < files.length && size > maxSize) {
                 const file = files[i];
-                await fs.remove(`${dir}/${file.name}`);
+                const oldFile = `${dir}/${file.name}`;
+
+                //отправляем только this.config.tempPublicDir
+                //TODO: убрать в будущем, т.к. уже делается ленивое сохранение compFilename в удаленном хранилище
+                if (this.remoteWebDavStorage && dir === this.config.tempPublicDir) {
+                    try {
+                        //log(`remoteWebDavStorage.putFile ${path.basename(oldFile)}`);
+                        await this.remoteWebDavStorage.putFile(oldFile);
+                    } catch (e) {
+                        log(LM_ERR, e.stack);
+                    }
+                }
+                await fs.remove(oldFile);
                 size -= file.stat.size;
                 i++;
             }

server/core/RemoteWebDavStorage.js

@@ -0,0 +1,107 @@
+const fs = require('fs-extra');
+const path = require('path');
+
+const { createClient } = require('webdav');
+
+class RemoteWebDavStorage {
+    constructor(config) {
+        this.config = Object.assign({}, config);
+        this.config.maxContentLength = this.config.maxContentLength || 10*1024*1024;
+        this.wdc = createClient(config.url, this.config);
+    }
+
+    _convertStat(data) {
+        return {
+            isDirectory: function() {
+                return data.type === "directory";
+            },
+            isFile: function() {
+                return data.type === "file";
+            },
+            mtime: (new Date(data.lastmod)).getTime(),
+            name: data.basename,
+            size: data.size || 0
+        };
+    }
+
+    async stat(filename) {
+        const stat = await this.wdc.stat(filename);
+        return this._convertStat(stat);
+    }
+
+    async writeFile(filename, data) {
+        return await this.wdc.putFileContents(filename, data, { maxContentLength: this.config.maxContentLength })
+    }
+
+    async unlink(filename) {
+        return await this.wdc.deleteFile(filename);
+    }
+
+    async readFile(filename) {
+        return await this.wdc.getFileContents(filename, { maxContentLength: this.config.maxContentLength })
+    }
+
+    async mkdir(dirname) {
+        return await this.wdc.createDirectory(dirname);
+    }
+
+    async putFile(filename) {
+        if (!await fs.pathExists(filename)) {
+            throw new Error(`File not found: ${filename}`);
+        }
+
+        const base = path.basename(filename);
+        let remoteFilename = `/${base}`;
+        
+        if (base.length > 3) {
+            const remoteDir = `/${base.substr(0, 3)}`;
+            try {
+                await this.mkdir(remoteDir);
+            } catch (e) {
+                //
+            }
+            remoteFilename = `${remoteDir}/${base}`;
+        }
+
+        try {
+            const localStat = await fs.stat(filename);
+            const remoteStat = await this.stat(remoteFilename);
+            if (remoteStat.isFile && localStat.size == remoteStat.size) {
+                return;
+            }
+            await this.unlink(remoteFilename);
+        } catch (e) {
+            //
+        }
+
+        const data = await fs.readFile(filename);
+        await this.writeFile(remoteFilename, data);
+    }
+
+    async getFile(filename) {
+        if (await fs.pathExists(filename)) {
+            return;
+        }
+
+        const base = path.basename(filename);
+        let remoteFilename = `/${base}`;        
+        if (base.length > 3) {
+            remoteFilename = `/${base.substr(0, 3)}/${base}`;
+        }
+
+        const data = await this.readFile(remoteFilename);
+        await fs.writeFile(filename, data);
+    }
+
+    async getFileSuccess(filename) {
+        try {
+            await this.getFile(filename);
+            return true;
+        } catch (e) {
+            //
+        }
+        return false;
+    }
+}
+
+module.exports = RemoteWebDavStorage;

server/routes.js

@@ -28,7 +28,9 @@ function initRoutes(app, config) {
         ['POST', '/api/reader/load-book', reader.loadBook.bind(reader), [aAll], {}],
         ['POST', '/api/reader/storage', reader.storage.bind(reader), [aAll], {}],
         ['POST', '/api/reader/upload-file', [upload.single('file'), reader.uploadFile.bind(reader)], [aAll], {}],
+        ['POST', '/api/reader/restore-cached-file', reader.restoreCachedFile.bind(reader), [aAll], {}],        
         ['POST', '/api/worker/get-state', worker.getState.bind(worker), [aAll], {}],
+        ['POST', '/api/worker/get-state-finish', worker.getStateFinish.bind(worker), [aAll], {}],
     ];
 
     //to app