Bump url-parse from 1.5.3 to 1.5.10

Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.3 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.3...1.5.10)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

build/linux.js

@@ -4,7 +4,7 @@ const util = require('util');
 const stream = require('stream');
 const pipeline = util.promisify(stream.pipeline);
 
-const axios = require('axios');
+const got = require('got');
 const FileDecompressor = require('../server/core/FileDecompressor');
 
 const distDir = path.resolve(__dirname, '../dist');
@@ -29,8 +29,7 @@ async function main() {
 
     if (!await fs.pathExists(sqliteDecompressedFilename)) {
         // Скачиваем node_sqlite3.node для винды, т.к. pkg не включает его в сборку
-        const res = await axios.get(sqliteRemoteUrl, {responseType: 'stream'})
+        await pipeline(got.stream(sqliteRemoteUrl), fs.createWriteStream(`${tempDownloadDir}/sqlite.tar.gz`));
-        await pipeline(res.data, fs.createWriteStream(`${tempDownloadDir}/sqlite.tar.gz`));
         console.log(`done downloading ${sqliteRemoteUrl}`);
 
         //распаковываем
@@ -47,8 +46,7 @@ async function main() {
         // Скачиваем ipfs
         const ipfsRemoteUrl = 'https://dist.ipfs.io/go-ipfs/v0.4.18/go-ipfs_v0.4.18_linux-amd64.tar.gz';
 
-        const res = await axios.get(ipfsRemoteUrl, {responseType: 'stream'})
+        await pipeline(got.stream(ipfsRemoteUrl), fs.createWriteStream(`${tempDownloadDir}/ipfs.tar.gz`));
-        await pipeline(res.data, fs.createWriteStream(`${tempDownloadDir}/ipfs.tar.gz`));
         console.log(`done downloading ${ipfsRemoteUrl}`);
 
         //распаковываем

build/win.js

@@ -4,7 +4,7 @@ const util = require('util');
 const stream = require('stream');
 const pipeline = util.promisify(stream.pipeline);
 
-const axios = require('axios');
+const got = require('got');
 const FileDecompressor = require('../server/core/FileDecompressor');
 
 const distDir = path.resolve(__dirname, '../dist');
@@ -29,8 +29,7 @@ async function main() {
 
     if (!await fs.pathExists(sqliteDecompressedFilename)) {
         // Скачиваем node_sqlite3.node для винды, т.к. pkg не включает его в сборку
-        const res = await axios.get(sqliteRemoteUrl, {responseType: 'stream'})
+        await pipeline(got.stream(sqliteRemoteUrl), fs.createWriteStream(`${tempDownloadDir}/sqlite.tar.gz`));
-        await pipeline(res.data, fs.createWriteStream(`${tempDownloadDir}/sqlite.tar.gz`));
         console.log(`done downloading ${sqliteRemoteUrl}`);
 
         //распаковываем
@@ -47,8 +46,7 @@ async function main() {
         // Скачиваем ipfs
         const ipfsRemoteUrl = 'https://dist.ipfs.io/go-ipfs/v0.4.18/go-ipfs_v0.4.18_windows-amd64.zip';
 
-        const res = await axios.get(ipfsRemoteUrl, {responseType: 'stream'})
+        await pipeline(got.stream(ipfsRemoteUrl), fs.createWriteStream(`${tempDownloadDir}/ipfs.zip`));
-        await pipeline(res.data, fs.createWriteStream(`${tempDownloadDir}/ipfs.zip`));
         console.log(`done downloading ${ipfsRemoteUrl}`);
 
         //распаковываем

client/api/misc.js

@@ -9,7 +9,7 @@ class Misc {
     async loadConfig() {
 
         const query = {params: [
-            'name', 'version', 'mode', 'maxUploadFileSize', 'useExternalBookConverter', 'acceptFileExt', 'branch',
+            'name', 'version', 'mode', 'maxUploadFileSize', 'useExternalBookConverter', 'branch',
         ]};
 
         try {

client/api/reader.js

@@ -1,6 +1,5 @@
 import axios from 'axios';
 import * as utils from '../share/utils';
-import * as cryptoUtils from '../share/cryptoUtils';
 import wsc from './webSocketConnection';
 
 const api = axios.create({
@@ -175,10 +174,11 @@ class Reader {
         return await axios.get(url, options);
     }
 
-    async uploadFile(file, maxUploadFileSize = 10*1024*1024, callback) {
+    async uploadFile(file, maxUploadFileSize, callback) {
+        if (!maxUploadFileSize)
+            maxUploadFileSize = 10*1024*1024;
         if (file.size > maxUploadFileSize)
             throw new Error(`Размер файла превышает ${maxUploadFileSize} байт`);
-
         let formData = new FormData();
         formData.append('file', file, file.name);
 
@@ -225,33 +225,6 @@ class Reader {
 
         return response;
     }
-
-    async uploadFileBuf(buf, urlCallback) {
-        const key = utils.toHex(cryptoUtils.sha256(buf));
-        const url = `disk://${key}`;
-
-        if (urlCallback)
-            urlCallback(url);
-
-        let response;
-        try {
-            await axios.head(`/upload/${key}`, {headers: {'Cache-Control': 'no-cache'}});
-            response = await wsc.message(await wsc.send({action: 'upload-file-touch', url}));
-        } catch (e) {
-            response = await wsc.message(await wsc.send({action: 'upload-file-buf', buf}));
-        }
-
-        if (response.error)
-            throw new Error(response.error);
-
-        return response;
-    }
-
-    async getUploadedFileBuf(url) {
-        url = url.replace('disk://', '/upload/');
-        return (await axios.get(url)).data;
-    }
-
 }
 
 export default new Reader();

client/components/ExternalLibs/BookmarkSettings/BookmarkSettings.vue

@@ -11,7 +11,7 @@
                         Открыть выбранную закладку
                     </q-tooltip>
                 </q-btn>
-                <q-input ref="search" v-model="search" class="col" outlined dense bg-color="white" placeholder="Найти">
+                <q-input ref="search" v-model="search" class="col" rounded outlined dense bg-color="white" placeholder="Найти">
                     <template #append>
                         <q-icon v-if="search !== ''" name="la la-times" class="cursor-pointer" @click="resetSearch" />
                     </template>

client/components/ExternalLibs/ExternalLibs.vue

@@ -5,19 +5,19 @@
         </template>
 
         <template #buttons>
-            <span class="header-button row justify-center items-center" @mousedown.stop @click="fullScreenToggle">
+            <span class="full-screen-button row justify-center items-center" @mousedown.stop @click="fullScreenToggle">
                 <q-icon :name="(fullScreenActive ? 'la la-compress-arrows-alt': 'la la-expand-arrows-alt')" size="16px" />
                 <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">На весь экран</q-tooltip>
             </span>
-            <span class="header-button row justify-center items-center" @mousedown.stop @click="changeScale(0.1)">
+            <span class="full-screen-button row justify-center items-center" @mousedown.stop @click="changeScale(0.1)">
                 <q-icon name="la la-plus" size="16px" />
                 <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">Увеличить масштаб</q-tooltip>
             </span>
-            <span class="header-button row justify-center items-center" @mousedown.stop @click="changeScale(-0.1)">
+            <span class="full-screen-button row justify-center items-center" @mousedown.stop @click="changeScale(-0.1)">
                 <q-icon name="la la-minus" size="16px" />
                 <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">Уменьшить масштаб</q-tooltip>
             </span>
-            <span class="header-button row justify-center items-center" @mousedown.stop @click="showHelp">
+            <span class="full-screen-button row justify-center items-center" @mousedown.stop @click="showHelp">
                 <q-icon name="la la-question-circle" size="16px" />
                 <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">Справка</q-tooltip>
             </span>
@@ -32,7 +32,7 @@
                     :options="rootLinkOptions"
                     style="width: 230px"
                     dropdown-icon="la la-angle-down la-sm"
-                    outlined dense emit-value map-options display-value-sanitize options-sanitize
+                    rounded outlined dense emit-value map-options display-value-sanitize options-sanitize
                     @popup-show="onSelectPopupShow" @popup-hide="onSelectPopupHide"
                 >
                     <template #prepend>
@@ -61,7 +61,7 @@
                     :options="selectedLinkOptions"
                     style="width: 50px"
                     dropdown-icon="la la-angle-down la-sm"
-                    outlined dense emit-value map-options hide-selected display-value-sanitize options-sanitize
+                    rounded outlined dense emit-value map-options hide-selected display-value-sanitize options-sanitize
                     @popup-show="onSelectPopupShow" @popup-hide="onSelectPopupHide"
                 >
                     <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
@@ -73,9 +73,9 @@
                     ref="input"
                     v-model="bookUrl"
                     class="col q-mr-sm"
-                    outlined dense
+                    rounded outlined dense
                     bg-color="white"
-                    placeholder="Скопируйте сюда ссылку на книгу и нажмите 'Открыть'"
+                    placeholder="Скопируйте сюда URL книги"
                     @focus="selectAllOnFocus" @keydown="bookUrlKeyDown"
                 >
                     <template #prepend>
@@ -99,7 +99,7 @@
                     </template>
                 </q-input>
 
-                <q-btn :disabled="!bookUrl" color="green-7" no-caps size="14px" @click="submitUrl">
+                <q-btn :disabled="!bookUrl" rounded color="green-7" no-caps size="14px" @click="submitUrl">
                     Открыть
                     <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
                         Открыть в читалке
@@ -894,15 +894,14 @@ export default vueComponent(ExternalLibs);
     background-color: #A0A0A0;
 }
 
-.header-button {
+.full-screen-button {
     width: 30px;
     height: 30px;
     cursor: pointer;
 }
 
-.header-button:hover {
+.full-screen-button:hover {
-    color: white;
+    background-color: #69C05F;
-    background-color: #39902F;
 }
 
 .transparent-layout {

client/components/Reader/ContentsPage/ContentsPage.vue

@@ -23,15 +23,15 @@
 
         <div class="q-mb-sm" />
 
-        <div v-show="selectedTab == 'contents'" ref="tabPanelContents" class="tab-panel">
+        <div v-show="selectedTab == 'contents'" class="tab-panel">
             <div>
                 <div v-for="item in contents" :key="item.key" class="column" style="width: 540px">
-                    <div :ref="`mainitem${item.key}`" class="row q-px-sm no-wrap" :class="{'item': !item.isBookPos, 'item-book-pos': item.isBookPos}">
+                    <div class="row q-px-sm no-wrap" :class="{'item': !item.isBookPos, 'item-book-pos': item.isBookPos}">
                         <div v-if="item.list.length" class="row justify-center items-center expand-button clickable" @click="expandClick(item.key)">
-                            <q-icon name="la la-caret-right" class="icon" :class="{'expanded-icon': item.expanded}" color="green-8" size="24px" />
+                            <q-icon name="la la-caret-right" class="icon" :class="{'expanded-icon': item.expanded}" color="green-8" size="20px" />
                         </div>
                         <div v-else class="no-expand-button clickable" @click="setBookPos(item.offset)">
-                            <q-icon name="la la-stop" class="icon" style="visibility: hidden" size="24px" />
+                            <q-icon name="la la-stop" class="icon" style="visibility: hidden" size="20px" />
                         </div>
                         <div class="col row clickable" @click="setBookPos(item.offset)">
                             <div :style="item.indentStyle"></div>
@@ -42,12 +42,8 @@
                         </div>
                     </div>
                     
-                    <div v-if="item.expanded" :ref="`subdiv${item.key}`" class="subitems-transition">
+                    <div v-if="item.expanded" :ref="`subitem${item.key}`" class="subitems-transition">
-                        <div 
+                        <div v-for="subitem in item.list" :key="subitem.key" class="row q-px-sm no-wrap" :class="{'subitem': !subitem.isBookPos, 'subitem-book-pos': subitem.isBookPos}">
-                            v-for="subitem in item.list" 
-                            :ref="`subitem${subitem.key}`" 
-                            :key="subitem.key" class="row q-px-sm no-wrap" :class="{'subitem': !subitem.isBookPos, 'subitem-book-pos': subitem.isBookPos}"
-                        >
                             <div class="col row clickable" @click="setBookPos(subitem.offset)">
                                 <div class="no-expand-button"></div>
                                 <div :style="subitem.indentStyle"></div>
@@ -65,10 +61,10 @@
             </div>
         </div>
 
-        <div v-show="selectedTab == 'images'" ref="tabPanelImages" class="tab-panel">
+        <div v-show="selectedTab == 'images'" class="tab-panel">
             <div>
                 <div v-for="item in images" :key="item.key" class="column" style="width: 540px">
-                    <div :ref="`image${item.key}`" class="row q-px-sm no-wrap" :class="{'item': !item.isBookPos, 'item-book-pos': item.isBookPos}">
+                    <div class="row q-px-sm no-wrap" :class="{'item': !item.isBookPos, 'item-book-pos': item.isBookPos}">
                         <div class="col row clickable" @click="setBookPos(item.offset)">
                             <div class="image-thumb-box row justify-center items-center">
                                 <div v-show="!imageLoaded[item.id]" class="image-thumb column justify-center">
@@ -128,10 +124,7 @@ const componentOptions = {
     watch: {
         bookPos() {
             this.updateBookPosSelection();
-        },
+        }
-        selectedTab() {
-            this.updateBookPosScrollTop();
-        },
     },
 };
 class ContentsPage {
@@ -289,30 +282,31 @@ class ContentsPage {
         if (!this.isVisible)
             return;
 
-        await this.$nextTick();
+        await utils.sleep(50);
         const bp = this.bookPos;
         
         for (let i = 0; i < this.contents.length; i++) {
             const item = this.contents[i];
             const nextOffset = (i < this.contents.length - 1 ? this.contents[i + 1].offset : this.parsed.textLength);
 
-            if (bp >= item.offset && bp < nextOffset) {
-                item.isBookPos = true;
-            } else if (item.isBookPos) {
-                item.isBookPos = false;
-            }
-
             for (let j = 0; j < item.list.length; j++) {
                 const subitem = item.list[j];
                 const nextSubOffset = (j < item.list.length - 1 ? item.list[j + 1].offset : nextOffset);
 
                 if (bp >= subitem.offset && bp < nextSubOffset) {
                     subitem.isBookPos = true;
-                    this.updateBookPosScrollTop('contents', item, subitem, j);
+                    this.contents[i] = Object.assign(item, {list: item.list});
                 } else if (subitem.isBookPos) {
                     subitem.isBookPos = false;
+                    this.contents[i] = Object.assign(item, {list: item.list});
                 }
             }
+
+            if (bp >= item.offset && bp < nextOffset) {
+                this.contents[i] = Object.assign(item, {isBookPos: true});
+            } else if (item.isBookPos) {
+                this.contents[i] = Object.assign(item, {isBookPos: false});
+            }
         }
 
         for (let i = 0; i < this.images.length; i++) {
@@ -320,96 +314,11 @@ class ContentsPage {
             const nextOffset = (i < this.images.length - 1 ? this.images[i + 1].offset : this.parsed.textLength);
 
             if (bp >= img.offset && bp < nextOffset) {
-                this.images[i].isBookPos = true;
+                this.images[i] = Object.assign(img, {isBookPos: true});
             } else if (img.isBookPos) {
-                this.images[i].isBookPos = false;
+                this.images[i] = Object.assign(img, {isBookPos: false});
             }
         }
-
-        this.updateBookPosScrollTop();
-    }
-
-    /*getOffsetTop(key) {
-        let el = this.getFirstElem(this.$refs[`mainitem${key}`]);
-        return (el ? el.offsetTop : 0);
-    }*/
-
-    async updateBookPosScrollTop() {
-        try {
-            await this.$nextTick();
-
-            if (this.selectedTab == 'contents') {
-                let item;
-                let subitem;
-                let i;
-
-                //ищем выделенные item
-                for(const _item of this.contents) {
-                    if (_item.isBookPos) {
-                        item = _item;
-                        for (let ii = 0; ii < item.list.length; ii++) {
-                            const _subitem = item.list[ii];
-                            if (_subitem.isBookPos) {
-                                subitem = _subitem;
-                                i = ii;
-                                break;
-                            }
-                        }
-                        break;
-                    }
-                }
-
-                if (!item)
-                    return;
-
-                //вычисляем и смещаем tabPanel.scrollTop
-                let el = this.getFirstElem(this.$refs[`mainitem${item.key}`]);
-                let elShift = 0;
-                if (subitem && item.expanded) {
-                    const subEl = this.getFirstElem(this.$refs[`subitem${subitem.key}`]);
-                    elShift = el.offsetHeight - subEl.offsetHeight*(i + 1);
-                } else {
-                    elShift = el.offsetHeight;
-                }
-
-                const tabPanel = this.$refs.tabPanelContents;
-                const halfH = tabPanel.clientHeight/2;
-                const newScrollTop = el.offsetTop - halfH - elShift;
-                if (newScrollTop < 20 + tabPanel.scrollTop - halfH || newScrollTop > -20 + tabPanel.scrollTop + halfH) 
-                    tabPanel.scrollTop = newScrollTop;
-            }
-
-            if (this.selectedTab == 'images') {
-                let item;
-
-                //ищем выделенные item
-                for(const _item of this.images) {
-                    if (_item.isBookPos) {
-                        item = _item;
-                        break;
-                    }
-                }
-
-                if (!item)
-                    return;
-
-                //вычисляем и смещаем tabPanel.scrollTop
-                let el = this.getFirstElem(this.$refs[`image${item.key}`]);
-
-                const tabPanel = this.$refs.tabPanelImages;
-                const halfH = tabPanel.clientHeight/2;
-                const newScrollTop = el.offsetTop - halfH - el.offsetHeight/2;
-
-                if (newScrollTop < 20 + tabPanel.scrollTop - halfH || newScrollTop > -20 + tabPanel.scrollTop + halfH) 
-                    tabPanel.scrollTop = newScrollTop;
-            }
-        } catch (e) {
-            console.error(e);
-        }
-    }
-
-    getFirstElem(items) {
-        return (Array.isArray(items) ? items[0] : items);
     }
 
     async expandClick(key) {
@@ -417,17 +326,17 @@ class ContentsPage {
         const expanded = !item.expanded;
 
         if (!expanded) {
-            let subdiv = this.getFirstElem(this.$refs[`subdiv${key}`]);
+            const subitems = this.$refs[`subitem${key}`];
-            subdiv.style.height = '0';
+            subitems.style.height = '0';
             await utils.sleep(200);
         }
 
-        this.contents[key].expanded = expanded;
+        this.contents[key] = Object.assign({}, item, {expanded});
 
         if (expanded) {
             await this.$nextTick();
-            let subdiv = this.getFirstElem(this.$refs[`subdiv${key}`]);
+            const subitems = this.$refs[`subitem${key}`];
-            subdiv.style.height = subdiv.scrollHeight + 'px';
+            subitems.style.height = subitems.scrollHeight + 'px';
         }
     }
 

client/components/Reader/HelpPage/HelpPage.vue

@@ -5,20 +5,13 @@
         </template>
 
         <div class="col column" style="min-width: 600px">
-            <div class="bg-grey-3 row">
+            <q-btn-toggle
-                <q-tabs
+                v-model="selectedTab"
-                    v-model="selectedTab"
+                toggle-color="primary"
-                    active-color="black"
+                no-caps unelevated
-                    active-bg-color="white"
+                :options="buttons"
-                    indicator-color="white"
+            />
-                    dense
+            <div class="separator"></div>
-                    no-caps
-                    inline-label
-                    class="bg-grey-4 text-grey-7"
-                >
-                    <q-tab v-for="btn in buttons" :key="btn.value" :name="btn.value" :label="btn.label" />
-                </q-tabs>
-            </div>
 
             <keep-alive>
                 <component :is="activePage" ref="page" class="col"></component>
@@ -100,4 +93,8 @@ export default vueComponent(HelpPage);
 </script>
 
 <style scoped>
+.separator {
+    height: 1px;
+    background-color: #E0E0E0;
+}
 </style>

client/components/Reader/LoaderPage/LoaderPage.vue

@@ -12,21 +12,13 @@
         </div>
 
         <div class="col-auto column justify-start items-center no-wrap overflow-hidden">
-            <q-input
+            <q-input ref="input" v-model="bookUrl" class="full-width q-px-sm" style="max-width: 700px" outlined dense bg-color="white" placeholder="URL книги" @keydown="onInputKeydown">
-                ref="input" v-model="bookUrl" class="full-width q-px-sm" style="max-width: 700px" 
-                outlined dense bg-color="white" placeholder="Ссылка на книгу или веб-страницу" @keydown="onInputKeydown"
-            >
                 <template #append>
                     <q-btn rounded flat style="width: 40px" icon="la la-check" @click="submitUrl" />
                 </template>
             </q-input>
 
-            <input
+            <input id="file" ref="file" type="file" style="display: none;" @change="loadFile" />
-                id="file" ref="file" type="file" 
-                style="display: none;"
-                :accept="acceptFileExt"
-                @change="loadFile" 
-            />
 
             <div class="q-my-sm"></div>
             <q-btn no-caps dense class="q-px-sm" color="primary" size="13px" @click="loadFileClick">
@@ -55,7 +47,6 @@
         </div>
 
         <div class="col column justify-end items-center no-wrap overflow-hidden">
-            <span v-if="mode == 'omnireader'" class="bottom-span clickable" @click="findBook">Найти книгу</span>
             <span class="bottom-span clickable" @click="openHelp">Справка</span>
             <!--span class="bottom-span clickable" @click="openDonate">Помочь проекту</span-->
 
@@ -64,18 +55,6 @@
         </div>
 
         <PasteTextPage v-if="pasteTextActive" ref="pasteTextPage" @paste-text-toggle="pasteTextToggle" @load-buffer="loadBuffer"></PasteTextPage>
-
-        <Dialog ref="dialog1" v-model="findBookVisible">
-            <template #header>
-                Подсказка ;-)
-            </template>
-
-            <div style="word-break: normal">
-                Если вы хотите найти определенную книгу, добро пожаловать в
-                раздел "Сетевая библиотека" (кнопка <q-icon name="la la-sitemap" size="32px" />) на сайте читалки
-                <a href="https://liberama.top" target="_blank">liberama.top</a>
-            </div>
-        </Dialog>
     </div>
 </template>
 
@@ -85,7 +64,6 @@ import vueComponent from '../../vueComponent.js';
 
 import GithubCorner from './GithubCorner/GithubCorner.vue';
 
-import Dialog from '../../share/Dialog.vue';
 import PasteTextPage from './PasteTextPage/PasteTextPage.vue';
 import {versionHistory} from '../versionHistory';
 import * as utils from '../../../share/utils';
@@ -93,7 +71,6 @@ import * as utils from '../../../share/utils';
 const componentOptions = {
     components: {
         GithubCorner,
-        Dialog,
         PasteTextPage,
     },
 };
@@ -103,7 +80,6 @@ class LoaderPage {
     bookUrl = null;
     loadPercent = 0;
     pasteTextActive = false;
-    findBookVisible = false;
 
     created() {
         this.commit = this.$store.commit;
@@ -136,10 +112,6 @@ class LoaderPage {
         return this.$store.state.config.version;
     }
 
-    get acceptFileExt() {
-        return this.$store.state.config.acceptFileExt;
-    }
-
     get isExternalConverter() {
         return this.$store.state.config.useExternalBookConverter;
     }
@@ -193,10 +165,6 @@ class LoaderPage {
         this.$emit('do-action', {action: 'donate'});
     }
     
-    findBook() {
-        this.findBookVisible = true;
-    }
-
     openComments() {
         window.open('http://samlib.ru/comment/b/bookpauk/bookpauk_reader', '_blank');
     }
@@ -213,9 +181,6 @@ class LoaderPage {
     }
 
     keyHook(event) {
-        if (this.$refs.dialog1.active)
-            return true;
-
         if (this.pasteTextActive) {
             return this.$refs.pasteTextPage.keyHook(event);
         }

client/components/Reader/ProgressPage/ProgressPage.vue

@@ -1,5 +1,5 @@
 <template>
-    <div v-show="visible" class="column justify-center items-center" style="background-color: rgba(0, 0, 0, 0.8); z-index: 100;">
+    <div v-show="visible" class="column justify-center items-center z-max" style="background-color: rgba(0, 0, 0, 0.8)">
         <div class="column justify-start items-center" style="height: 250px">
             <q-circular-progress
                 show-value

client/components/Reader/Reader.vue

@@ -2,7 +2,7 @@
     <div class="column no-wrap">
         <div v-show="toolBarActive" ref="header" class="header">
             <div ref="buttons" class="row justify-between no-wrap">
-                <div class="row no-wrap">
+                <div>
                     <button ref="loader" v-ripple class="tool-button" :class="buttonActiveClass('loader')" @click="buttonClick('loader')">
                         <q-icon name="la la-arrow-left" size="32px" />
                         <q-tooltip :delay="1500" anchor="bottom right" content-style="font-size: 80%">
@@ -29,8 +29,7 @@
                     </button>
                 </div>
 
-                <div class="row no-wrap">
+                <div>
-                    <div class="space"></div>
                     <button v-show="showToolButton['undoAction']" ref="undoAction" v-ripple class="tool-button" :class="buttonActiveClass('undoAction')" @click="buttonClick('undoAction')">
                         <q-icon name="la la-angle-left" size="32px" />
                         <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
@@ -105,10 +104,9 @@
                             {{ rstore.readerActions['recentBooks'] }}
                         </q-tooltip>
                     </button>
-                    <div class="space"></div>
                 </div>
 
-                <div class="row no-wrap">
+                <div>
                     <button v-show="showToolButton['clickControl']" ref="clickControl" v-ripple class="tool-button" :class="buttonActiveClass('clickControl')" @click="buttonClick('clickControl')">
                         <q-icon name="la la-mouse" size="32px" />
                         <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
@@ -141,7 +139,6 @@
                     @load-file="loadFile"
                     @book-pos-changed="bookPosChanged"
                     @do-action="doAction"
-                    @hide-tool-bar="hideToolBar"
                 ></component>
             </keep-alive>
 
@@ -163,7 +160,7 @@
             <ContentsPage v-show="contentsActive" ref="contentsPage" :book-pos="bookPos" :is-visible="contentsActive" @do-action="doAction" @book-pos-changed="bookPosChanged"></ContentsPage>
 
             <ServerStorage v-show="hidden" ref="serverStorage"></ServerStorage>
-            <ReaderDialogs ref="dialogs" @donate-toggle="donateToggle" @version-history-toggle="versionHistoryToggle" @load-buffer-toggle="loadBufferToggle"></ReaderDialogs>
+            <ReaderDialogs ref="dialogs" @donate-toggle="donateToggle" @version-history-toggle="versionHistoryToggle"></ReaderDialogs>
         </div>
     </div>
 </template>
@@ -194,7 +191,6 @@ import ReaderDialogs from './ReaderDialogs/ReaderDialogs.vue';
 
 import bookManager from './share/bookManager';
 import wallpaperStorage from './share/wallpaperStorage';
-import coversStorage from './share/coversStorage';
 import dynamicCss from '../../share/dynamicCss';
 
 import rstore from '../../store/modules/reader';
@@ -203,7 +199,6 @@ import miscApi from '../../api/misc';
 
 import {versionHistory} from './versionHistory';
 import * as utils from '../../share/utils';
-import LockQueue from '../../share/LockQueue';
 
 const componentOptions = {
     components: {
@@ -316,8 +311,6 @@ class Reader {
         this.reader = this.$store.state.reader;
         this.config = this.$store.state.config;
 
-        this.lock = new LockQueue(100);
-
         this.$root.addEventHook('key', this.keyHook);
 
         this.lastActivePage = false;
@@ -350,13 +343,6 @@ class Reader {
             this.debouncedSetRecentBook(newValue);
         }, 15000, {maxWait: 20000});
 
-        this.debouncedHideToolBar = _.debounce((event) => {
-            if (this.toolBarHideOnScroll && this.toolBarActive !== !!event.show) {
-                this.commit('reader/setToolBarActive', !!event.show);
-                this.$root.eventHook('resize');
-            }
-        }, 200);
-
         document.addEventListener('fullscreenchange', () => {
             this.fullScreenActive = (document.fullscreenElement !== null);
         });
@@ -365,10 +351,10 @@ class Reader {
     }
 
     mounted() {
+        this.updateHeaderMinWidth();
+
         (async() => {
             await wallpaperStorage.init();
-            await coversStorage.init();
-            
             await bookManager.init(this.settings);
             bookManager.addEventListener(this.bookManagerEvent);
 
@@ -416,7 +402,6 @@ class Reader {
         this.clickControlActive = this.clickControl;
         this.blinkCachedLoad = settings.blinkCachedLoad;
         this.showToolButton = settings.showToolButton;
-        this.toolBarHideOnScroll = settings.toolBarHideOnScroll;
         this.enableSitesFilter = settings.enableSitesFilter;
         this.showNeedUpdateNotify = settings.showNeedUpdateNotify;
         this.splitToPara = settings.splitToPara;
@@ -431,6 +416,8 @@ class Reader {
             return this.readerActionByKeyCode[utils.keyEventToCode(event)];
         }
 
+        this.updateHeaderMinWidth();
+        
         this.loadWallpapers();//no await
     }
 
@@ -453,47 +440,22 @@ class Reader {
 
     //wallpaper css
     async loadWallpapers() {
-        if (!_.isEqual(this.userWallpapers, this.prevUserWallpapers)) {//оптимизация
+        const wallpaperDataLength = await wallpaperStorage.getLength();
-            this.prevUserWallpapers = _.cloneDeep(this.userWallpapers);
+        if (wallpaperDataLength !== this.wallpaperDataLength) {//оптимизация
+            this.wallpaperDataLength = wallpaperDataLength;
 
             let newCss = '';
-            let updated = false;
-            const wallpaperExists = new Set();
             for (const wp of this.userWallpapers) {
-                wallpaperExists.add(wp.cssClass);
+                const data = await wallpaperStorage.getData(wp.cssClass);
 
-                let data = await wallpaperStorage.getData(wp.cssClass);
                 if (!data) {
                     //здесь будем восстанавливать данные с сервера
-                    const url = `disk://${wp.cssClass.replace('user-paper', '')}`;
-                    try {
-                        data = await readerApi.getUploadedFileBuf(url);
-                        await wallpaperStorage.setData(wp.cssClass, data);
-                        updated = true;
-                    } catch (e) {
-                        console.error(e);
-                    }
                 }
 
                 if (data) {
                     newCss += `.${wp.cssClass} {background: url(${data}) center; background-size: 100% 100%;}`;                
                 }
             }
-
-            //почистим wallpaperStorage
-            for (const key of await wallpaperStorage.getKeys()) {
-                if (!wallpaperExists.has(key)) {
-                    await wallpaperStorage.removeData(key);
-                }
-            }
-
-            //обновим settings, если загружали обои из /upload/
-            if (updated) {
-                const newSettings = _.cloneDeep(this.settings);
-                newSettings.needUpdateSettingsView = (newSettings.needUpdateSettingsView < 10 ? newSettings.needUpdateSettingsView + 1 : 0);
-                this.commit('reader/setSettings', newSettings);
-            }
-
             dynamicCss.replace('wallpapers', newCss);
         }
     }
@@ -522,6 +484,17 @@ class Reader {
         }
     }
 
+    updateHeaderMinWidth() {
+        const showButtonCount = Object.values(this.showToolButton).reduce((a, b) => a + (b ? 1 : 0), 0);
+        if (this.$refs.buttons)
+            this.$refs.buttons.style.minWidth = 65*showButtonCount + 'px';
+        (async() => {
+            await utils.sleep(1000);
+            if (this.$refs.header)
+                this.$refs.header.style.overflowX = 'auto';
+        })();
+    }
+
     checkSetStorageAccessKey() {
         const q = this.$route.query;
 
@@ -702,10 +675,6 @@ class Reader {
         this.$root.eventHook('resize');
     }
 
-    hideToolBar(event) {
-        this.debouncedHideToolBar(event);
-    }
-
     fullScreenToggle() {
         this.fullScreenActive = !this.fullScreenActive;
         if (this.fullScreenActive) {
@@ -941,7 +910,7 @@ class Reader {
 
     refreshBook() {
         const mrb = this.mostRecentBook();
-        this.loadBook(Object.assign({}, mrb, {force: true}));
+        this.loadBook({url: mrb.url, uploadFileName: mrb.uploadFileName, force: true});
     }
 
     undoAction() {
@@ -1026,6 +995,7 @@ class Reader {
                     classResult = classDisabled;
                     break;
                 case 'refresh':
+                case 'recentBooks':
                     if (!this.mostRecentBookReactive)
                         classResult = classDisabled;
                     break;
@@ -1094,7 +1064,7 @@ class Reader {
         return result;
     }
 
-    async _loadBook(opts) {
+    async loadBook(opts) {
         if (!opts || !opts.url) {
             this.mostRecentBook();
             return;
@@ -1104,6 +1074,10 @@ class Reader {
 
         let url = encodeURI(decodeURI(opts.url));
 
+        //TODO: убрать конвертирование 'file://' после 06.2021
+        if (url.length == 71 && url.indexOf('file://') == 0)
+            url = url.replace(/^file/, 'disk');
+
         if ((url.indexOf('http://') != 0) && (url.indexOf('https://') != 0) &&
             (url.indexOf('disk://') != 0))
             url = 'http://' + url;
@@ -1130,37 +1104,33 @@ class Reader {
             progress.show();
             progress.setState({state: 'parse'});
 
-            // есть ли среди загруженных
+            // есть ли среди недавних
-            let wasOpened = bookManager.findRecentByUrlAndPath(url, opts.path);
+            const key = bookManager.keyFromUrl(url);
-            wasOpened = (wasOpened ? _.cloneDeep(wasOpened) : {});
+            let wasOpened = await bookManager.getRecentBook({key});
-
+            wasOpened = (wasOpened ? wasOpened : {});
-            wasOpened = Object.assign(wasOpened, {
+            const bookPos = (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPos);
-                url: (opts.url !== undefined ? opts.url : wasOpened.url),
+            const bookPosSeen = (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPosSeen);
-                path: (opts.path !== undefined ? opts.path : wasOpened.path),
+            const uploadFileName = (opts.uploadFileName ? opts.uploadFileName : '');
-                bookPos: (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPos),
-                bookPosSeen: (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPosSeen),
-                uploadFileName: (opts.uploadFileName ? opts.uploadFileName : wasOpened.uploadFileName),
-            });
 
             let book = null;
 
             if (!opts.force) {
                 // пытаемся загрузить и распарсить книгу в менеджере из локального кэша
-                const bookParsed = await bookManager.getBook(wasOpened, (prog) => {
+                const bookParsed = await bookManager.getBook({url, path: opts.path}, (prog) => {
                     progress.setState({progress: prog});
                 });
 
                 // если есть в локальном кэше
                 if (bookParsed) {
-                    await bookManager.setRecentBook(Object.assign(wasOpened, bookParsed));
+                    await bookManager.setRecentBook(Object.assign({bookPos, bookPosSeen}, bookParsed));
                     this.mostRecentBook();
-                    this.addAction(wasOpened.bookPos);
+                    this.addAction(bookPos);
                     this.loaderActive = false;
                     progress.hide(); this.progressActive = false;
                     this.blinkCachedLoadMessage();
 
                     this.checkBookPosPercent();
-                    this.activateClickMapPage();//no await
+                    await this.activateClickMapPage();
                     return;
                 }
 
@@ -1174,7 +1144,7 @@ class Reader {
                         });
                         book = Object.assign({}, wasOpened, {data: resp.data});
                     } catch (e) {
-                        this.$root.notify.error('Конвертированный файл не найден на сервере.<br>Пробуем загрузить оригинал.', 'Ошибка загрузки');
+                        //молчим
                     }
                 }
             }
@@ -1185,7 +1155,7 @@ class Reader {
             if (!book) {
                 book = await readerApi.loadBook({
                         url,
-                        uploadFileName: wasOpened.uploadFileName,
+                        uploadFileName,
                         enableSitesFilter: this.enableSitesFilter,
                         skipHtmlCheck: (this.splitToPara ? true : false),
                         isText: (this.splitToPara ? true : false),
@@ -1202,44 +1172,14 @@ class Reader {
 
             // добавляем в bookManager
             progress.setState({state: 'parse', step: 5});
-
             const addedBook = await bookManager.addBook(book, (prog) => {
                 progress.setState({progress: prog});
             });
 
-            // sameBookKey
-            if (url.indexOf('disk://') == 0) {
-                //ищем такой файл в загруженных
-                let found = bookManager.findRecentBySameBookKey(wasOpened.uploadFileName);
-                found = (found ? _.cloneDeep(found) : found);
-
-                if (found) {
-                    if (wasOpened.sameBookKey != found.sameBookKey) {
-                        //спрашиваем, надо ли объединить файлы
-                        const askResult = bookManager.keysEqual(found.path, addedBook.path) || 
-                            await this.$root.stdDialog.askYesNo(`
-    Файл с именем "${wasOpened.uploadFileName}" уже есть в загруженных.
-    <br>Объединить позицию?`, 'Найдена похожая книга');
-                        if (askResult) {
-                            wasOpened.bookPos = found.bookPos;
-                            wasOpened.bookPosSeen = found.bookPosSeen;
-                            wasOpened.sameBookKey = found.sameBookKey;
-                        }
-                    }
-                } else {
-                    wasOpened.sameBookKey = wasOpened.uploadFileName;
-                }
-            } else {
-                wasOpened.sameBookKey = addedBook.url;
-            }
-
-            if (!bookManager.keysEqual(wasOpened.path, addedBook.path))
-                delete wasOpened.loadTime;
-
             // добавляем в историю
-            await bookManager.setRecentBook(Object.assign(wasOpened, addedBook));
+            await bookManager.setRecentBook(Object.assign({bookPos, bookPosSeen, uploadFileName}, addedBook));
             this.mostRecentBook();
-            this.addAction(wasOpened.bookPos);
+            this.addAction(bookPos);
             this.updateRoute(true);
 
             this.loaderActive = false;
@@ -1250,11 +1190,11 @@ class Reader {
                 this.stopBlink = true;
 
             this.checkBookPosPercent();
-            this.activateClickMapPage();//no await
+            await this.activateClickMapPage();
         } catch (e) {
             progress.hide(); this.progressActive = false;
             this.loaderActive = true;
-            if (!this.showHelpOnErrorIfNeeded(url)) {
+            if (!this.showHelpOnErrorIfNeeded(e.message)) {
                 this.$root.stdDialog.alert(e.message, 'Ошибка', {color: 'negative'});
             }
         } finally {
@@ -1262,16 +1202,7 @@ class Reader {
         }
     }
 
-    async loadBook(opts) {
+    async loadFile(opts) {
-        await this.lock.get();
-        try {
-            await this._loadBook(opts);
-        } finally {
-            this.lock.ret();
-        }
-    }
-
-    async _loadFile(opts) {
         this.progressActive = true;
 
         await this.$nextTick();
@@ -1287,7 +1218,7 @@ class Reader {
 
             progress.hide(); this.progressActive = false;
 
-            await this._loadBook({url, uploadFileName: opts.file.name, force: true});
+            await this.loadBook({url, uploadFileName: opts.file.name, force: true});
         } catch (e) {
             progress.hide(); this.progressActive = false;
             this.loaderActive = true;
@@ -1295,15 +1226,6 @@ class Reader {
         }
     }
 
-    async loadFile(opts) {
-        await this.lock.get();
-        try {
-            await this._loadFile(opts);
-        } finally {
-            this.lock.ret();
-        }
-    }
-
     blinkCachedLoadMessage() {
         if (!this.blinkCachedLoad)
             return;
@@ -1513,33 +1435,12 @@ export default vueComponent(Reader);
 
 <style scoped>
 .header {
-    height: 50px;
     padding-left: 5px;
     padding-right: 5px;
     background-color: #1B695F;
     color: #000;
-    overflow-x: auto;
+    overflow: hidden;
-    overflow-y: hidden;
+    height: 50px;
-    scrollbar-color: #c49a60 #e4e4e4;
-}
-
-.header::-webkit-scrollbar {
-    height: 10px;
-}
- 
-.header::-webkit-scrollbar-track {
-    background-color: #e4e4e4;
-    border-radius: 4px;
-}
- 
-.header::-webkit-scrollbar-thumb {
-    background-color: #c49a60;
-    border-radius: 4px;
-    border: 2px solid #e4e4e4;
-}
-
-.header::-webkit-scrollbar-thumb:hover {
-    background-color: #b48a50;
 }
 
 .main {

client/components/Reader/ReaderDialogs/ReaderDialogs.vue

@@ -54,7 +54,7 @@
 
                 <br><br>
                 <div class="row justify-center">
-                    <!--q-btn class="q-px-sm" color="primary" dense no-caps @click="openDonate">
+                    <!--q-btn class="q-px-sm" color="primary" dense no-caps rounded @click="openDonate">
                         Помочь проекту
                     </q-btn-->
                 </div>
@@ -162,7 +162,6 @@ class ReaderDialogs {
     }
 
     loadBufferClick() {
-        this.$emit('load-buffer-toggle');
         this.urlHelpVisible = false;
     }
 

client/components/Reader/SearchPage/SearchPage.vue

@@ -8,10 +8,12 @@
             <span v-show="initStep">{{ initPercentage }}%</span>
 
             <div v-show="!initStep" class="input">
-                <q-input
+                <!--input ref="input"
-                    ref="input" v-model="needle"
+                    placeholder="что ищем"
+                    :value="needle" @input="needle = $event.target.value"/-->
+                <q-input ref="input" v-model="needle"
                     class="col" outlined dense
-                    placeholder="Найти"
+                    placeholder="что ищем"
                     @keydown="inputKeyDown"         
                 />
                 <div style="position: absolute; right: 10px; margin-top: 10px; font-size: 16px;">
@@ -106,7 +108,7 @@ class SearchPage {
             this.parsed = parsed;
         }
 
-        this.header = 'Поиск в тексте';
+        this.header = 'Найти';
         await this.$nextTick();
         this.$refs.input.focus();
         this.$refs.input.select();

client/components/Reader/ServerStorage/ServerStorage.vue

@@ -728,7 +728,7 @@ class ServerStorage {
                 const ids = id.split('.');
                 if (!(ids.length == 2) || !(ids[0] == this.hashedStorageKey))
                     throw new Error(`decodeStorageItems: bad id - ${id}`);
-                items[utils.fromBase58(ids[1]).toString()] = decoded;
+                items[utils.fromBase58(ids[1])] = decoded;
             }
         }
 

client/components/Reader/SettingsPage/ButtonsTab.inc

@@ -0,0 +1,9 @@
+<div class="part-header">Показывать кнопки панели</div>
+
+<div class="item row" v-for="item in toolButtons" :key="item.name" v-show="item.name != 'libs' || mode == 'liberama.top'">
+    <div class="label-3"></div>
+    <div class="col row">
+        <q-checkbox size="xs" v-model="showToolButton[item.name]" :label="rstore.readerActions[item.name]"
+        />
+    </div>
+</div>

client/components/Reader/SettingsPage/SettingsPage.vue

@@ -1,5 +1,5 @@
 <template>
-    <Window ref="window" width="600px" @close="close">
+    <Window ref="window" height="95%" width="600px" @close="close">
         <template #header>
             Настройки
         </template>
@@ -24,7 +24,7 @@
                     <div v-show="tabsScrollable" class="q-pt-lg" />
                     <q-tab class="tab" name="profiles" icon="la la-users" label="Профили" />
                     <q-tab class="tab" name="view" icon="la la-eye" label="Вид" />
-                    <q-tab class="tab" name="toolbar" icon="la la-grip-horizontal" label="Панель" />
+                    <q-tab class="tab" name="buttons" icon="la la-grip-horizontal" label="Кнопки" />
                     <q-tab class="tab" name="keys" icon="la la-gamepad" label="Управление" />
                     <q-tab class="tab" name="pagemove" icon="la la-school" label="Листание" />
                     <q-tab class="tab" name="convert" icon="la la-magic" label="Конвертир." />
@@ -82,8 +82,8 @@
                     </div>
                 </div>
                 <!-- Кнопки ---------------------------------------------------------------------->
-                <div v-if="selectedTab == 'toolbar'" class="fit tab-panel">
+                <div v-if="selectedTab == 'buttons'" class="fit tab-panel">
-                    @@include('./ToolBarTab.inc');
+                    @@include('./ButtonsTab.inc');
                 </div>
                 <!-- Управление ------------------------------------------------------------------>
                 <div v-if="selectedTab == 'keys'" class="fit column">
@@ -124,7 +124,6 @@ import NumInput from '../../share/NumInput.vue';
 import UserHotKeys from './UserHotKeys/UserHotKeys.vue';
 import wallpaperStorage from '../share/wallpaperStorage';
 
-import readerApi from '../../../api/reader';
 import rstore from '../../../store/modules/reader';
 import defPalette from './defPalette';
 
@@ -637,17 +636,8 @@ class SettingsPage {
 
                     if (index < 0)
                         newUserWallpapers.push({label, cssClass});
-                    if (!wallpaperStorage.keyExists(cssClass)) {
+                    if (!wallpaperStorage.keyExists(cssClass))
                         await wallpaperStorage.setData(cssClass, data);
-                        //отправим data на сервер в файл `/upload/${key}`
-                        try {
-                            //const res = 
-                            await readerApi.uploadFileBuf(data);
-                            //console.log(res);
-                        } catch (e) {
-                            console.error(e);
-                        }
-                    }
 
                     this.userWallpapers = newUserWallpapers;
                     this.wallpaper = cssClass;
@@ -712,11 +702,11 @@ export default vueComponent(SettingsPage);
     margin-bottom: 5px;
 }
 
-.label-1, .label-3, .label-7 {
+.label-1, .label-7 {
     width: 75px;
 }
 
-.label-2, .label-4, .label-5 {
+.label-2, .label-3, .label-4, .label-5 {
     width: 110px;
 }
 

client/components/Reader/SettingsPage/ToolBarTab.inc

@@ -1,18 +0,0 @@
-<div class="part-header">Отображение</div>
-
-<div class="item row no-wrap">
-    <div class="label-3"></div>
-    <q-checkbox size="xs" v-model="toolBarHideOnScroll" label="Скрывать/показывать панель при прокрутке" >
-        <q-tooltip :delay="1000" anchor="top middle" self="bottom middle" content-style="font-size: 80%">
-            Скрывать/показывть панель при прокрутке текста вперед/назад
-        </q-tooltip>
-    </q-checkbox>
-</div>
-
-<div class="part-header">Показывать кнопки</div>
-
-<div class="item row no-wrap" v-for="item in toolButtons" :key="item.name" v-show="item.name != 'libs' || mode == 'liberama.top'">
-    <div class="label-3"></div>
-        <q-checkbox size="xs" v-model="showToolButton[item.name]" :label="rstore.readerActions[item.name]"
-        />
-</div>

client/components/Reader/SettingsPage/UserHotKeys/UserHotKeys.vue

@@ -13,7 +13,7 @@
                     ref="input"
                     v-model="search"
                     class="q-ml-sm col"
-                    outlined dense
+                    outlined dense rounded
                     bg-color="grey-4"
                     placeholder="Найти"                    
                     @click.stop

client/components/Reader/TextPage/TextPage.vue

@@ -6,32 +6,29 @@
         </div>
         <div ref="scrollBox1" class="layout over-hidden" @wheel.prevent.stop="onMouseWheel">
             <div ref="scrollingPage1" class="layout over-hidden" @transitionend="onPage1TransitionEnd" @animationend="onPage1AnimationEnd">
-                <div @copy.prevent="copyText" v-html="page1"></div>
+                <div v-html="page1"></div>
             </div>
         </div>
         <div ref="scrollBox2" class="layout over-hidden" @wheel.prevent.stop="onMouseWheel">
             <div ref="scrollingPage2" class="layout over-hidden" @transitionend="onPage2TransitionEnd" @animationend="onPage2AnimationEnd">
-                <div @copy.prevent="copyText" v-html="page2"></div>
+                <div v-html="page2"></div>
             </div>
         </div>
         <div v-show="showStatusBar" ref="statusBar" class="layout">
             <div v-html="statusBar"></div>
         </div>
-        <div
+        <div v-show="clickControl" ref="layoutEvents" class="layout events" 
-            v-show="clickControl" ref="layoutEvents" class="layout events" 
             oncontextmenu="return false;"
             @mousedown.prevent.stop="onMouseDown" @mouseup.prevent.stop="onMouseUp"
             @wheel.prevent.stop="onMouseWheel"
             @touchstart.stop="onTouchStart" @touchend.stop="onTouchEnd" @touchmove.stop="onTouchMove" @touchcancel.prevent.stop="onTouchCancel"            
         >
-            <div
+            <div v-show="showStatusBar && statusBarClickOpen" @mousedown.prevent.stop @touchstart.stop
-                v-show="showStatusBar && statusBarClickOpen" @mousedown.prevent.stop @touchstart.stop
                 @click.prevent.stop="onStatusBarClick"
                 v-html="statusBarClickable"
             ></div>
         </div>
-        <div
+        <div v-show="!clickControl && showStatusBar && statusBarClickOpen" class="layout" 
-            v-show="!clickControl && showStatusBar && statusBarClickOpen" class="layout" 
             @mousedown.prevent.stop @touchstart.stop
             @click.prevent.stop="onStatusBarClick"
             v-html="statusBarClickable"
@@ -49,7 +46,6 @@ import vueComponent from '../../vueComponent.js';
 
 import {loadCSS} from 'fg-loadcss';
 import _ from 'lodash';
-import he from 'he';
 
 import './TextPage.css';
 
@@ -66,14 +62,7 @@ const componentOptions = {
     watch: {
         bookPos: function() {
             this.$emit('book-pos-changed', {bookPos: this.bookPos, bookPosSeen: this.bookPosSeen});
-
             this.draw();
-
-            if (this.userBookPosChange) {
-                this.$emit('hide-tool-bar', {show: (this.bookPos == 0 || this.bookPos < this.prevBookPos)});
-                this.prevBookPos = this.bookPos;
-                this.userBookPosChange = false;
-            }
         },
         bookPosSeen: function() {
             this.$emit('book-pos-changed', {bookPos: this.bookPos, bookPosSeen: this.bookPosSeen});
@@ -106,8 +95,6 @@ class TextPage {
     lastBook = null;
     bookPos = 0;
     bookPosSeen = null;
-    prevBookPos = 0;
-    userBookPosChange = false;
 
     fontStyle = null;
     fontSize = null;
@@ -164,7 +151,7 @@ class TextPage {
 
         this.$root.addEventHook('resize', async() => {
             this.$nextTick(this.onResize);
-            await utils.sleep(200);
+            await utils.sleep(500);
             this.$nextTick(this.onResize);
         });
     }
@@ -508,25 +495,12 @@ class TextPage {
     }
 
     async onResize() {
-        if (this.resizing)
-            return;
-        
-        this.resizing = true;
         try {
-            const scrolled = this.doingScrolling;
-            if (scrolled)
-                await this.stopTextScrolling();
-
             this.calcDrawProps();
             this.setBackground();
             this.draw();
-
-            if (scrolled)
-                this.startTextScrolling();
         } catch (e) {
             //
-        } finally {
-            this.resizing = false;
         }
     }
 
@@ -674,7 +648,7 @@ class TextPage {
         }
 
         if (this.book && this.bookPos > 0 && this.bookPos >= this.parsed.textLength) {
-            this.doEnd(true, false);
+            this.doEnd(true);
             return;
         }
 
@@ -697,7 +671,7 @@ class TextPage {
         this.debouncedDrawPageDividerAndOrnament();
 
         if (this.book && this.linesDown && this.linesDown.length < this.pageLineCount) {
-            this.doEnd(true, false);
+            this.doEnd(true);
             return;
         }
     }
@@ -933,14 +907,12 @@ class TextPage {
 
     doDown() {
         if (this.linesDown && this.linesDown.length > this.pageLineCount && this.pageLineCount > 0) {
-            this.userBookPosChange = true;
             this.bookPos = this.linesDown[1].begin;
         }
     }
 
     doUp() {
         if (this.linesUp && this.linesUp.length > 1 && this.pageLineCount > 0) {
-            this.userBookPosChange = true;
             this.bookPos = this.linesUp[1].begin;
         }
     }
@@ -953,7 +925,6 @@ class TextPage {
             if (i >= 0 && this.linesDown.length >= 2*i + (this.keepLastToFirst ? 1 : 0)) {
                 this.currentAnimation = this.pageChangeAnimation;
                 this.pageChangeDirectionDown = true;
-                this.userBookPosChange = true;
                 this.bookPos = this.linesDown[i].begin;
             } else 
                 this.doEnd();
@@ -969,7 +940,6 @@ class TextPage {
             if (i >= 0 && this.linesUp.length > i) {
                 this.currentAnimation = this.pageChangeAnimation;
                 this.pageChangeDirectionDown = false;
-                this.userBookPosChange = true;
                 this.bookPos = this.linesUp[i].begin;
             }
         }
@@ -978,11 +948,10 @@ class TextPage {
     doHome() {
         this.currentAnimation = this.pageChangeAnimation;
         this.pageChangeDirectionDown = false;
-        this.userBookPosChange = true;
         this.bookPos = 0;
     }
 
-    doEnd(noAni, isUser = true) {
+    doEnd(noAni) {
         if (this.parsed.para.length && this.pageLineCount > 0) {
             let i = this.parsed.para.length - 1;
             let lastPos = this.parsed.para[i].offset + this.parsed.para[i].length - 1;
@@ -993,7 +962,6 @@ class TextPage {
                 if (!noAni)
                     this.currentAnimation = this.pageChangeAnimation;
                 this.pageChangeDirectionDown = true;
-                this.userBookPosChange = isUser;
                 this.bookPos = lines[i].begin;
             }
         }
@@ -1233,54 +1201,8 @@ class TextPage {
         }
 
         return action;
-    }
+   }
 
-    copyText(event) {
-        //все это для того, чтобы правильно расставить переносы \n при копировании текста
-        //прямо с текущей страницы
-
-        //подготовка, вытаскиваем весь текст страницы
-        const lines = this.getLines(this.bookPos);
-        const decodedLines = [];
-        for (const line of lines.linesDown) {
-            let lineText = '';
-            for (const part of line.parts) {
-                lineText += part.text;
-            }
-            decodedLines.push({text: he.decode(lineText), first: line.first});
-        }
-
-        let i = 0;
-        const findDecoded = (line) => {
-            for (let j = i; j < decodedLines.length; j++) {
-                const decoded = decodedLines[j];
-                if (decoded.text.indexOf(line) >= 0) {
-                    i = j;
-                    return decoded;
-                }
-            }
-            return;
-        }
-
-        const selection = document.getSelection();
-        const splitted = selection.toString().split(/[\n\r]/);
-        
-        let filtered = '';
-        //формируем filtered, учитывая переносы из decodedLines
-        for (const line of splitted) {
-            const found = findDecoded(line);
-            if (found && found.first) {
-                filtered += (filtered ? '\n' : '') + line;
-            } else {
-                filtered += (filtered ? '\r ' : '') + line;
-            }
-        }
-
-        //маленькие хитрости, убираем переносы по слогам
-        filtered = filtered.replace(/-\r /g, '').replace(/\r /g, ' ');
-
-        event.clipboardData.setData('text/plain', filtered);
-    }
 }
 
 export default vueComponent(TextPage);

client/components/Reader/share/BookParser.js

@@ -3,8 +3,6 @@ import sax from '../../../../server/core/sax';
 import * as utils from '../../../share/utils';
 
 const maxImageLineCount = 100;
-const maxParaLength = 10000;
-const maxParaTextLength = 10000;
 
 // defaults
 const defaultSettings = {
@@ -85,7 +83,6 @@ export default class BookParser {
         let binaryId = '';
         let binaryType = '';
         let dimPromises = [];
-        this.coverPageId = '';
 
         //оглавление
         this.contents = [];
@@ -229,26 +226,13 @@ export default class BookParser {
             paraOffset += len;
         };
 
-        const growParagraph = (text, len, textRaw) => {
+        const growParagraph = (text, len) => {
-            //начальный параграф
             if (paraIndex < 0) {
                 newParagraph();
                 growParagraph(text, len);
                 return;
             }
 
-            //ограничение на размер куска текста в параграфе
-            if (textRaw && textRaw.length > maxParaTextLength) {
-                while (textRaw.length > 0) {
-                    const textPart = textRaw.substring(0, maxParaTextLength);
-                    textRaw = textRaw.substring(maxParaTextLength);
-
-                    newParagraph();
-                    growParagraph(textPart, textPart.length);
-                }
-                return;
-            }
-
             if (inSubtitle) {
                 curSubtitle.title += text;
             } else if (inTitle) {
@@ -256,14 +240,6 @@ export default class BookParser {
             }
 
             const p = para[paraIndex];
-
-            //ограничение на размер параграфа
-            if (p.length > maxParaLength) {
-                newParagraph();
-                growParagraph(text, len);
-                return;
-            }
-
             p.length += len;
             p.text += text;
             paraOffset += len;
@@ -290,7 +266,7 @@ export default class BookParser {
                     const href = attrs.href.value;
                     const alt = (attrs.alt && attrs.alt.value ? attrs.alt.value : '');
                     const {id, local} = this.imageHrefToId(href);
-                    if (local) {//local
+                    if (href[0] == '#') {//local
                         imageNum++;
 
                         if (inPara && !this.sets.showInlineImagesInCenter && !center)
@@ -302,11 +278,6 @@ export default class BookParser {
 
                         if (inPara && this.sets.showInlineImagesInCenter)
                             newParagraph();
-
-                        //coverpage
-                        if (path == '/fictionbook/description/title-info/coverpage/image') {
-                            this.coverPageId = id;
-                        }
                     } else {//external
                         imageNum++;
 
@@ -565,7 +536,7 @@ export default class BookParser {
                 tClose += (center ? '</center>' : '');
 
                 if (text != ' ')
-                    growParagraph(`${tOpen}${text}${tClose}`, text.length, text);
+                    growParagraph(`${tOpen}${text}${tClose}`, text.length);
                 else
                     growParagraph(' ', 1);
             }

client/components/Reader/share/bookManager.js

@@ -1,14 +1,10 @@
 import localForage from 'localforage';
-import path from 'path-browserify';
 import _ from 'lodash';
 
-import BookParser from './BookParser';
-import readerApi from '../../../api/reader';
-import coversStorage from './coversStorage';
 import * as utils from '../../../share/utils';
+import BookParser from './BookParser';
 
 const maxDataSize = 500*1024*1024;//compressed bytes
-const maxRecentLength = 5000;
 
 //локальный кэш метаданных книг, ограничение maxDataSize
 const bmMetaStore = localForage.createInstance({
@@ -21,6 +17,9 @@ const bmDataStore = localForage.createInstance({
 });
 
 //список недавно открытых книг
+const bmRecentStoreOld = localForage.createInstance({
+    name: 'bmRecentStore'
+});
 const bmRecentStoreNew = localForage.createInstance({
     name: 'bmRecentStoreNew'
 });
@@ -40,7 +39,7 @@ class BookManager {
 
         this.saveRecentItem = _.debounce(() => {
             bmRecentStoreNew.setItem('recent-item', this.recentItem);
-            this.recentRev = (this.recentRev < maxRecentLength ? this.recentRev + 1 : 1);
+            this.recentRev = (this.recentRev < 1000 ? this.recentRev + 1 : 1);
             bmRecentStoreNew.setItem('rev', this.recentRev);
         }, 200, {maxWait: 300});
 
@@ -55,9 +54,6 @@ class BookManager {
             if (this.recentItem)
                 this.recent[this.recentItem.key] = this.recentItem;
 
-            //конвертируем в новые ключи
-            await this.convertRecent();
-
             this.recentLastKey = await bmRecentStoreNew.getItem('recent-last-key');
             if (this.recentLastKey) {
                 const meta = await bmMetaStore.getItem(`bmMeta-${this.recentLastKey}`);
@@ -74,40 +70,6 @@ class BookManager {
         this.loadStored();//no await
     }
 
-    //TODO: убрать в 2025г
-    async convertRecent() {
-        const converted = await bmRecentStoreNew.getItem('recent-converted');
-
-        if (converted)
-            return;
-
-        const newRecent = {};
-        for (const book of Object.values(this.recent)) {
-
-            if (!book.path) {
-                continue;
-            }
-
-            const newKey = this.keyFromPath(book.path);
-
-            newRecent[newKey] = _.cloneDeep(book);
-            newRecent[newKey].key = newKey;
-            if (!newRecent[newKey].loadTime)
-                newRecent[newKey].loadTime = newRecent[newKey].addTime;
-        }
-
-        this.recent = newRecent;
-
-        //console.log(converted);
-        (async() => {
-            await utils.sleep(3000);
-            this.saveRecent();
-            this.emit('recent-changed');
-            this.emit('set-recent');
-            await bmRecentStoreNew.setItem('recent-converted', true);
-        })();
-    }
-
     //Ленивая асинхронная загрузка bmMetaStore
     async loadStored() {
         //даем время для загрузки последней читаемой книги, чтобы не блокировать приложение
@@ -234,8 +196,8 @@ class BookManager {
 
     async addBook(newBook, callback) {        
         let meta = {url: newBook.url, path: newBook.path};
-        meta.key = this.keyFromPath(meta.path);
+        meta.key = this.keyFromUrl(meta.url);
-        meta.addTime = Date.now();//время добавления в кеш
+        meta.addTime = Date.now();
 
         const cb = (perc) => {
             const p = Math.round(30*perc/100);
@@ -270,10 +232,10 @@ class BookManager {
     async hasBookParsed(meta) {
         if (!this.books) 
             return false;
-        if (!meta.path)
+        if (!meta.url)
             return false;
         if (!meta.key)
-            meta.key = this.keyFromPath(meta.path);
+            meta.key = this.keyFromUrl(meta.url);
 
         let book = this.books[meta.key];
 
@@ -288,12 +250,8 @@ class BookManager {
 
     async getBook(meta, callback) {
         let result = undefined;
-
-        if (!meta.path)
-            return;
-
         if (!meta.key)
-            meta.key = this.keyFromPath(meta.path);
+            meta.key = this.keyFromUrl(meta.url);
 
         result = this.books[meta.key];
 
@@ -303,6 +261,11 @@ class BookManager {
                 this.books[meta.key] = result;
         }
 
+        //Если файл на сервере изменился, считаем, что в кеше его нету
+        if (meta.path && result && meta.path != result.path) {
+            return;
+        }
+
         if (result && !result.parsed) {
             let data = await bmDataStore.getItem(`bmData-${meta.key}`);
             callback(5);
@@ -347,36 +310,9 @@ class BookManager {
         const parsed = new BookParser(this.settings);
 
         const parsedMeta = await parsed.parse(data, callback);
-
-        //cover page
-        let coverPageUrl = '';
-        if (parsed.coverPageId && parsed.binary[parsed.coverPageId]) {
-            const bin = parsed.binary[parsed.coverPageId];
-            let dataUrl = `data:${bin.type};base64,${bin.data}`;
-            try {
-                dataUrl = await utils.resizeImage(dataUrl, 160, 160, 0.94);
-            } catch (e) {
-                console.error(e);
-            }
-
-            //отправим dataUrl на сервер в /upload
-            try {
-                await readerApi.uploadFileBuf(dataUrl, (url) => {
-                    coverPageUrl = url;
-                });
-            } catch (e) {
-                console.error(e);
-            }
-
-            //сохраним в storage
-            if (coverPageUrl)
-                await coversStorage.setData(coverPageUrl, dataUrl);
-        }
-
         const result = Object.assign({}, meta, parsedMeta, {
             length: data.length,
             textLength: parsed.textLength,
-            coverPageUrl,
             parsed
         });
 
@@ -389,20 +325,10 @@ class BookManager {
         return result;
     }
 
-    /*keyFromUrl(url) {
+    keyFromUrl(url) {
         return utils.stringToHex(url);
-    }*/
-
-    keyFromPath(bookPath) {
-        return path.basename(bookPath);
     }
 
-    keysEqual(bookPath1, bookPath2) {
-        if (bookPath1 === undefined || bookPath2 === undefined)
-            return false;
-        
-        return (this.keyFromPath(bookPath1) === this.keyFromPath(bookPath2));
-    }
     //-- recent --------------------------------------------------------------
     async recentSetItem(item = null, skipCheck = false) {
         const rev = await bmRecentStoreNew.getItem('rev');
@@ -443,10 +369,7 @@ class BookManager {
 
     async setRecentBook(value) {
         let result = this.metaOnly(value);
-        result.touchTime = Date.now();//время последнего чтения
+        result.touchTime = Date.now();
-        if (!result.loadTime)
-            result.loadTime = Date.now();//время загрузки файла
-
         result.deleted = 0;
 
         if (this.recent[result.key]) {
@@ -462,9 +385,9 @@ class BookManager {
         return this.recent[value.key];
     }
 
-    async delRecentBook(value, delFlag = 1) {
+    async delRecentBook(value) {
         const item = this.recent[value.key];
-        item.deleted = delFlag;
+        item.deleted = 1;
 
         if (this.recentLastKey == value.key) {
             await this.recentSetLastKey(null);
@@ -474,18 +397,11 @@ class BookManager {
         this.emit('recent-deleted', value.key);
     }
 
-    async restoreRecentBook(value) {
-        const item = this.recent[value.key];
-        item.deleted = 0;
-
-        await this.recentSetItem(item);
-    }
-
     async cleanRecentBooks() {
         const sorted = this.getSortedRecent();
 
         let isDel = false;
-        for (let i = maxRecentLength; i < sorted.length; i++) {
+        for (let i = 1000; i < sorted.length; i++) {
             delete this.recent[sorted[i].key];
             isDel = true;
         }
@@ -505,7 +421,7 @@ class BookManager {
 
         let max = 0;
         let result = null;
-        for (const key in this.recent) {
+        for (let key in this.recent) {
             const book = this.recent[key];
             if (!book.deleted && book.touchTime > max) {
                 max = book.touchTime;
@@ -536,43 +452,6 @@ class BookManager {
         return result;
     }
 
-    findRecentByUrlAndPath(url, bookPath) {
-        if (bookPath) {
-            const key = this.keyFromPath(bookPath);
-            const book = this.recent[key];
-            if (book && !book.deleted)
-                return book;
-        }
-
-        let max = 0;
-        let result = null;
-
-        for (const key in this.recent) {
-            const book = this.recent[key];
-            if (!book.deleted && book.url == url && book.loadTime > max) {
-                max = book.loadTime;
-                result = book;
-            }
-        }
-
-        return result;
-    }
-
-    findRecentBySameBookKey(sameKey) {
-        let max = 0;
-        let result = null;
-
-        for (const key in this.recent) {
-            const book = this.recent[key];
-            if (!book.deleted && book.sameBookKey == sameKey && book.loadTime > max) {
-                max = book.loadTime;
-                result = book;
-            }
-        }
-
-        return result;
-    }
-
     async setRecent(value) {
         const mergedRecent = _.cloneDeep(this.recent);
 

client/components/Reader/share/coversStorage.js

@@ -1,61 +0,0 @@
-import localForage from 'localforage';
-//import _ from 'lodash';
-import * as utils from '../../../share/utils';
-
-const maxDataSize = 100*1024*1024;
-
-const coversStore = localForage.createInstance({
-    name: 'coversStorage'
-});
-
-class CoversStorage {
-    constructor() {
-    }
-
-    async init() {
-        this.cleanCovers(); //no await
-    }
-
-    async setData(key, data) {
-        await coversStore.setItem(key, {addTime: Date.now(), data});
-    }
-
-    async getData(key) {
-        const item = await coversStore.getItem(key);
-        return (item ? item.data : undefined);
-    }
-
-    async removeData(key) {
-        await coversStore.removeItem(key);
-    }
-
-    async cleanCovers() {
-        await utils.sleep(10000);
-
-        while (1) {// eslint-disable-line no-constant-condition
-            let size = 0;
-            let min = Date.now();
-            let toDel = null;
-            for (const key of (await coversStore.keys())) {
-                const item = await coversStore.getItem(key);
-
-                size += item.data.length;
-
-                if (item.addTime < min) {
-                    toDel = key;
-                    min = item.addTime;
-                }
-            }
-
-
-            if (size > maxDataSize && toDel) {
-                await this.removeData(toDel);
-            } else {
-                break;
-            }
-        }
-    }
-
-}
-
-export default new CoversStorage();

client/components/Reader/share/wallpaperStorage.js

@@ -32,10 +32,6 @@ class WallpaperStorage {
         this.cachedKeys = await wpStore.keys();
     }
 
-    async getKeys() {
-        return await wpStore.keys();
-    }
-
     keyExists(key) {//не асинхронная
         return this.cachedKeys.includes(key);
     }

client/components/Reader/versionHistory.js

@@ -1,34 +1,12 @@
 export const versionHistory = [
 {
-    version: '0.11.8',
+    version: '0.11.4',
-    releaseDate: '2022-07-14',
+    releaseDate: '2022-04-14',
-    showUntil: '2022-07-13',
+    showUntil: '2022-04-13',
     content:
 `
 <ul>
-    <li>добавлено отображение и синхронизация обложек в окне загруженных книг</li>
+    <li>небольшие дополнения интерфейса</li>
-    <li>добавлена синхронизация обоев</li>
-</ul>
-
-`
-},
-
-{
-    version: '0.11.7',
-    releaseDate: '2022-07-12',
-    showUntil: '2022-07-19',
-    content:
-`
-<ul>
-    <li>добавлено автосокрытие панели управления при листании, отключается в настройках</li>
-    <li>изменения в окне загруженных книг:</li>
-        <ul>
-            <li>добавлена группировка по версиям файла одной и той же книги</li>
-            <li>группировка происходит по имени загружаемого файла, либо по URL книги</li>
-            <li>добавлены различные методы сортировки списка загруженных книг</li>
-            <li>нумерация всегда осуществляется по времени загрузки</li>
-        </ul>
-    <li>незначительные общие изменения интерфейса, приведение к единому стилю</li>
     <li>исправления багов</li>
 </ul>
 
@@ -36,27 +14,25 @@ export const versionHistory = [
 },
 
 {
-    version: '0.11.6',
+    version: '0.11.3',
-    releaseDate: '2022-07-02',
+    releaseDate: '2022-03-29',
-    showUntil: '2022-07-01',
+    showUntil: '2022-03-28',
     content:
 `
 <ul>
-    <li>улучшено копирование текста прямо со страницы, для переводчиков</li>
+    <li>исправления багов</li>
-    <li>актуализация используемых пакетов</li>
 </ul>
 
 `
 },
 
 {
-    version: '0.11.5',
+    version: '0.11.2',
-    releaseDate: '2022-04-15',
+    releaseDate: '2022-01-11',
-    showUntil: '2022-04-14',
+    showUntil: '2022-01-10',
     content:
 `
 <ul>
-    <li>небольшие дополнения интерфейса</li>
     <li>исправления багов</li>
 </ul>
 

client/components/share/StdDialog.vue

@@ -55,34 +55,6 @@
             </div>
         </div>
 
-        <!--------------------------------------------------->
-        <div v-show="type == 'askYesNo'" class="bg-white no-wrap">
-            <div class="header row">
-                <div class="caption col row items-center q-ml-md">
-                    <q-icon v-show="caption" class="q-mr-sm" :class="iconColor" :name="iconName" size="28px"></q-icon>
-                    <div v-html="caption"></div>
-                </div>
-                <div class="close-icon column justify-center items-center">
-                    <q-btn v-close-popup flat round dense>
-                        <q-icon name="la la-times" size="18px"></q-icon>
-                    </q-btn>
-                </div>
-            </div>
-
-            <div class="q-mx-md">
-                <div v-html="message"></div>
-            </div>
-
-            <div class="buttons row justify-end q-pa-md">
-                <q-btn v-close-popup class="q-px-md q-ml-sm" dense no-caps>
-                    Нет
-                </q-btn>
-                <q-btn class="q-px-md q-ml-sm" color="primary" dense no-caps @click="okClick">
-                    Да
-                </q-btn>
-            </div>
-        </div>
-
         <!--------------------------------------------------->
         <div v-show="type == 'prompt'" class="bg-white no-wrap">
             <div class="header row">
@@ -290,23 +262,6 @@ class StdDialog {
         });
     }
 
-    askYesNo(message, caption, opts) {
-        return new Promise((resolve) => {
-            this.init(message, caption, opts);
-
-            this.hideTrigger = () => {
-                if (this.ok) {
-                    resolve(true);
-                } else {
-                    resolve(false);
-                }
-            };
-
-            this.type = 'askYesNo';
-            this.active = true;
-        });
-    }
-
     prompt(message, caption, opts) {
         return new Promise((resolve) => {
             this.enableValidator = false;

client/components/share/Window.vue

@@ -153,7 +153,7 @@ export default vueComponent(Window);
 }
 
 .header {
-    background: linear-gradient(to bottom right, #007000, #59B04F);
+    background: linear-gradient(to bottom right, green, #59B04F);
     align-items: center;
     height: 30px;
 }
@@ -161,8 +161,8 @@ export default vueComponent(Window);
 .header-text {
     margin-left: 10px;
     margin-right: 10px;
-    color: #FFFFA0;
+    color: yellow;
-    text-shadow: 2px 2px 5px #005000, 2px 1px 5px #005000;
+    text-shadow: 2px 1px 5px black, 2px 2px 5px black;
     overflow: hidden;
     white-space: nowrap;
 }
@@ -174,8 +174,7 @@ export default vueComponent(Window);
 }
 
 .close-button:hover {
-    color: white;
+    background-color: #69C05F;
-    background-color: #FF3030;
 }
 
 </style>

client/quasar.js

@@ -32,8 +32,6 @@ import {QPopupProxy} from 'quasar/src/components/popup-proxy';
 import {QDialog} from 'quasar/src/components/dialog';
 import {QChip} from 'quasar/src/components/chip';
 import {QTree} from 'quasar/src/components/tree';
-import {QVirtualScroll} from 'quasar/src/components/virtual-scroll';
-
 //import {QExpansionItem} from 'quasar/src/components/expansion-item';
 
 const components = {
@@ -64,7 +62,6 @@ const components = {
     QChip,
     QTree,
     //QExpansionItem,
-    QVirtualScroll,
 };
 
 //directives 

client/share/LockQueue.js

@@ -1,53 +0,0 @@
-class LockQueue {
-    constructor(queueSize) {
-        this.queueSize = queueSize;
-        this.freed = true;
-        this.waitingQueue = [];
-    }
-
-    //async
-    get(take = true) {
-        return new Promise((resolve, reject) => {
-            if (this.freed) {
-                if (take)
-                    this.freed = false;
-                resolve();
-                return;
-            }
-
-            if (this.waitingQueue.length < this.queueSize) {
-                this.waitingQueue.push({resolve, reject});
-            } else {
-                reject(new Error('Lock queue is too long'));
-            }
-        });
-    }
-
-    ret() {
-        if (this.waitingQueue.length) {
-            this.waitingQueue.shift().resolve();
-        } else {
-            this.freed = true;
-        }
-    }
-
-    //async
-    wait() {
-        return this.get(false);
-    }
-
-    retAll() {
-        while (this.waitingQueue.length) {
-            this.waitingQueue.shift().resolve();
-        }
-    }
-
-    errAll(error = 'rejected') {
-        while (this.waitingQueue.length) {
-            this.waitingQueue.shift().reject(new Error(error));
-        }
-    }
-
-}
-
-export default LockQueue;

client/share/utils.js

@@ -90,7 +90,7 @@ export function toBase58(data) {
 }
 
 export function fromBase58(data) {
-    return Buffer.from(bs58.decode(data));
+    return bs58.decode(data);
 }
 
 //base-x слишком тормозит, используем sjcl
@@ -107,10 +107,6 @@ export function fromBase64(data) {
     ));
 }
 
-export function hasProp(obj, prop) {
-    return Object.prototype.hasOwnProperty.call(obj, prop);
-}
-
 export function getObjDiff(oldObj, newObj, opts = {}) {
     const {
         exclude = [],
@@ -130,7 +126,7 @@ export function getObjDiff(oldObj, newObj, opts = {}) {
         for (const key of Object.keys(oldObj)) {
             const kp = `${keyPath}${key}`;
 
-            if (Object.prototype.hasOwnProperty.call(newObj, key)) {
+            if (newObj.hasOwnProperty(key)) {
                 if (ex.has(kp))
                     continue;
 
@@ -153,7 +149,7 @@ export function getObjDiff(oldObj, newObj, opts = {}) {
             if (exAdd.has(kp))
                 continue;
 
-            if (!Object.prototype.hasOwnProperty.call(oldObj, key)) {
+            if (!oldObj.hasOwnProperty(key)) {
                 result.add[key] = _.cloneDeep(newObj[key]);
             }
         }
@@ -217,7 +213,7 @@ export function applyObjDiff(obj, diff, opts = {}) {
 
     const change = diff.change;
     for (const key of Object.keys(change)) {
-        if (Object.prototype.hasOwnProperty.call(result, key)) {
+        if (result.hasOwnProperty(key)) {
             if (_.isObject(change[key])) {
                 result[key] = applyObjDiff(result[key], change[key], opts);
             } else {
@@ -364,49 +360,3 @@ export function getBookTitle(fb2) {
 
     return result;
 }
-
-export function resizeImage(dataUrl, toWidth, toHeight, quality = 0.9) {
-    return new Promise ((resolve, reject) => { (async() => {
-        const img = new Image();
-
-        let resolved = false;
-        img.onload = () => {
-            try {
-                let width = img.width;
-                let height = img.height;
-
-                if (width > height) {
-                    if (width > toWidth) {
-                        height = height * (toWidth / width);
-                        width = toWidth;
-                    }
-                } else {
-                    if (height > toHeight) {
-                        width = width * (toHeight / height);
-                        height = toHeight;
-                    }
-                }
-
-                const canvas = document.createElement('canvas');
-                canvas.width = width;
-                canvas.height = height;
-                const ctx = canvas.getContext('2d');
-                ctx.drawImage(img, 0, 0, width, height);
-                const result = canvas.toDataURL('image/jpeg', quality);
-                resolved = true;
-                resolve(result);
-            } catch (e) {
-                reject(e);
-                return;
-            }
-        };
-
-        img.onerror = reject;
-
-        img.src = dataUrl;
-
-        await sleep(1000);
-        if (!resolved)
-            reject('Не удалось изменить размер');
-    })().catch(reject); });
-}

client/store/modules/reader.js

@@ -21,7 +21,7 @@ const readerActions = {
     'offlineMode': 'Автономный режим (без интернета)',
     'contents': 'Оглавление/закладки',
     'libs': 'Сетевая библиотека',
-    'recentBooks': 'Показать загруженные',
+    'recentBooks': 'Открыть недавние',
     'switchToolbar': 'Показать/скрыть панель управления',
     'donate': '',
     'bookBegin': 'В начало книги',
@@ -70,7 +70,7 @@ const hotKeys = [
     {name: 'scrolling', codes: ['Z']},
     {name: 'setPosition', codes: ['P']},
     {name: 'search', codes: ['Ctrl+F']},
-    {name: 'copyText', codes: ['Ctrl+Space']},    
+    {name: 'copyText', codes: ['Ctrl+C']},    
     {name: 'convOptions', codes: ['Ctrl+M']},
     {name: 'refresh', codes: ['R']},
     {name: 'contents', codes: ['C']},
@@ -185,14 +185,8 @@ const settingDefaults = {
 
     fontShifts: {},
     showToolButton: {},
-    toolBarHideOnScroll: true,
     userHotKeys: {},
     userWallpapers: [],
-
-    recentShowSameBook: false,
-    recentSortMethod: '',
-
-    needUpdateSettingsView: 0,
 };
 
 for (const font of fonts)
@@ -228,6 +222,9 @@ const libsDefaults = {
         {r: 'http://flibusta.is', s: 'http://flibusta.is', list: [
             {l: 'http://flibusta.is', c: 'Флибуста | Книжное братство'},
         ]},
+        {r: 'https://flibs.in', s: 'https://flibs.in', list: [
+            {l: 'https://flibs.in', c: 'Flibs'},
+        ]},
         {r: 'http://fantasy-worlds.org', s: 'http://fantasy-worlds.org', list: [
             {l: 'http://fantasy-worlds.org', c: 'Миры Фэнтези'},
         ]},

docs/liberama.top/liberama

@@ -18,7 +18,7 @@ server {
 
   server_name liberama.top;
 
-  client_max_body_size 100m;
+  client_max_body_size 50m;
   proxy_read_timeout 1h;
 
   gzip on;
@@ -63,7 +63,7 @@ server {
   listen 80;
   server_name b.liberama.top;
 
-  client_max_body_size 100m;
+  client_max_body_size 50m;
   proxy_read_timeout 1h;
 
   gzip on;
@@ -140,6 +140,5 @@ server {
 
   location / {
     proxy_pass http://fantasy-worlds.org;
-    proxy_hide_header x-frame-options;
   }
 }

docs/omnireader.ru/cron_server.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if ! pgrep -x "liberama" > /dev/null ; then
-    sudo -H -u www-data bash -c "cd /var/www; /home/liberama/liberama >/dev/null"
+    sudo -H -u www-data bash -c "cd /var/www; /home/liberama/liberama"
 else
     echo "Process 'liberama' already running"
 fi

docs/omnireader.ru/omnireader

@@ -7,7 +7,7 @@ server {
 
   server_name omnireader.ru;
 
-  client_max_body_size 100m;
+  client_max_body_size 50m;
   proxy_read_timeout 1h;
 
   gzip on;
@@ -52,7 +52,7 @@ server {
   listen 80;
   server_name old.omnireader.ru;
 
-  client_max_body_size 100m;
+  client_max_body_size 50m;
 
   gzip on;
   gzip_min_length 1024;

docs/omnireader.ru/start_server.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-sudo -H -u www-data bash -c "cd /var/www; /home/liberama/liberama >/dev/null & disown"
+sudo -H -u www-data bash -c "cd /var/www; /home/liberama/liberama" & disown
 sudo service cron start

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Liberama",
-  "version": "0.11.8",
+  "version": "0.11.4",
   "author": "Book Pauk <bookpauk@gmail.com>",
   "license": "CC0-1.0",
   "repository": "bookpauk/liberama",
@@ -28,17 +28,17 @@
     "@babel/preset-env": "^7.16.0",
     "@vue/compiler-sfc": "^3.2.22",
     "babel-loader": "^8.2.3",
-    "copy-webpack-plugin": "^11.0.0",
+    "copy-webpack-plugin": "^9.1.0",
     "css-loader": "^6.5.1",
-    "css-minimizer-webpack-plugin": "^4.0.0",
+    "css-minimizer-webpack-plugin": "^3.1.3",
-    "eslint": "^8.19.0",
+    "eslint": "^8.2.0",
-    "eslint-plugin-vue": "^9.2.0",
+    "eslint-plugin-vue": "^8.0.3",
     "html-webpack-plugin": "^5.5.0",
     "mini-css-extract-plugin": "^2.4.4",
     "pkg": "^5.5.1",
     "terser-webpack-plugin": "^5.2.5",
-    "vue-eslint-parser": "^9.0.3",
+    "vue-eslint-parser": "^8.0.1",
-    "vue-loader": "^17.0.0",
+    "vue-loader": "^16.8.3",
     "vue-style-loader": "^4.1.3",
     "webpack": "^5.64.1",
     "webpack-cli": "^4.9.1",
@@ -50,24 +50,25 @@
   "dependencies": {
     "@quasar/extras": "^1.12.0",
     "@vue/compat": "^3.2.21",
-    "axios": "^0.27.2",
+    "axios": "^0.24.0",
-    "base-x": "^4.0.0",
+    "base-x": "^3.0.9",
     "chardet": "^1.4.0",
     "compression": "^1.7.4",
     "express": "^4.17.1",
     "fg-loadcss": "^3.1.0",
-    "fs-extra": "^10.1.0",
+    "fs-extra": "^9.0.1",
+    "got": "^11.8.2",
     "he": "^1.2.0",
     "iconv-lite": "^0.6.3",
-    "jembadb": "^3.0.8",
+    "jembadb": "^2.3.0",
     "localforage": "^1.10.0",
     "lodash": "^4.17.21",
     "minimist": "^1.2.5",
-    "multer": "^1.4.5-lts.1",
+    "multer": "^1.4.3",
     "pako": "^2.0.4",
     "path-browserify": "^1.0.1",
     "pidusage": "^3.0.0",
-    "quasar": "^2.7.5",
+    "quasar": "^2.3.2",
     "safe-buffer": "^5.2.1",
     "sanitize-html": "^2.5.3",
     "sjcl": "^1.0.8",
@@ -76,8 +77,8 @@
     "sqlite3": "^5.0.2",
     "tar-fs": "^2.1.1",
     "unbzip2-stream": "^1.4.3",
-    "vue": "^3.2.37",
+    "vue": "^3.2.22",
-    "vue-router": "^4.1.1",
+    "vue-router": "^4.0.12",
     "vuex": "^4.0.2",
     "vuex-persistedstate": "^4.1.0",
     "webdav": "^4.7.0",

server/config/base.js

@@ -22,8 +22,7 @@ module.exports = {
     maxUploadPublicDirSize: 200*1024*1024,//100Мб
 
     useExternalBookConverter: false,
-    acceptFileExt: '.fb2, .fb3, .html, .txt, .zip, .bz2, .gz, .rar, .epub, .mobi, .rtf, .doc, .docx, .pdf, .djvu, .jpg, .jpeg, .png',
+    webConfigParams: ['name', 'version', 'mode', 'maxUploadFileSize', 'useExternalBookConverter', 'branch'],
-    webConfigParams: ['name', 'version', 'mode', 'maxUploadFileSize', 'useExternalBookConverter', 'acceptFileExt', 'branch'],
 
     db: [
         {
@@ -49,7 +48,7 @@ module.exports = {
     servers: [
         {
             serverName: '1',
-            mode: 'normal', //'none', 'normal', 'site', 'reader', 'omnireader', 'liberama.top'
+            mode: 'normal', //'none', 'normal', 'site', 'reader', 'omnireader'
             ip: '0.0.0.0',
             port: '33080',
         },

server/controllers/WebSocketController.js

@@ -25,10 +25,6 @@ class WebSocketController {
             ws.on('message', (message) => {
                 this.onMessage(ws, message.toString());
             });
-
-            ws.on('error', (err) => {
-                log(LM_ERR, err);
-            });
         });
 
         setTimeout(() => { this.periodicClean(); }, cleanPeriod);
@@ -74,10 +70,6 @@ class WebSocketController {
                     await this.readerRestoreCachedFile(req, ws); break;
                 case 'reader-storage':
                     await this.readerStorageDo(req, ws); break;
-                case 'upload-file-buf':
-                    await this.uploadFileBuf(req, ws); break;
-                case 'upload-file-touch':
-                    await this.uploadFileTouch(req, ws); break;
 
                 default:
                     throw new Error(`Action not found: ${req.action}`);
@@ -176,20 +168,6 @@ class WebSocketController {
 
         this.send(await this.readerStorage.doAction(req.body), req, ws);
     }
-
-    async uploadFileBuf(req, ws) {
-        if (!req.buf)
-            throw new Error(`key 'buf' is empty`);
-        
-        this.send({url: await this.readerWorker.saveFileBuf(req.buf)}, req, ws);
-    }
-
-    async uploadFileTouch(req, ws) {
-        if (!req.url)
-            throw new Error(`key 'url' is empty`);
-        
-        this.send({url: await this.readerWorker.uploadFileTouch(req.url)}, req, ws);
-    }
 }
 
 module.exports = WebSocketController;

server/controllers/WorkerController.js

@@ -26,6 +26,59 @@ class WorkerController extends BaseController {
         return false;
     }
 
+    //TODO: удалить бесполезную getStateFinish
+    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/AsyncExit.js

@@ -21,10 +21,10 @@ class AsyncExit {
     }
 
     _init(signals, codeOnSignal) {
-        const runSingalCallbacks = async(signal, err, origin) => {
+        const runSingalCallbacks = async(signal) => {
             for (const signalCallback of this.onSignalCallbacks.keys()) {
                 try {
-                    await signalCallback(signal, err, origin);
+                    await signalCallback(signal);
                 } catch(e) {
                     console.error(e);
                 }
@@ -32,8 +32,8 @@ class AsyncExit {
         };
 
         for (const signal of signals) {
-            process.once(signal, async(err, origin) => {
+            process.once(signal, async() => {
-                await runSingalCallbacks(signal, err, origin);
+                await runSingalCallbacks(signal);
                 this.exit(codeOnSignal);
             });
         }

server/core/FileDownloader.js

@@ -1,4 +1,4 @@
-const axios = require('axios');
+const got = require('got');
 
 class FileDownloader {
     constructor(limitDownloadSize = 0) {
@@ -7,82 +7,54 @@ class FileDownloader {
 
     async load(url, callback, abort) {
         let errMes = '';
-
         const options = {
             headers: {
                 'user-agent': 'Mozilla/5.0 (X11; HasCodingOs 1.0; Linux x64) AppleWebKit/637.36 (KHTML, like Gecko) Chrome/70.0.3112.101 Safari/637.36 HasBrowser/5.0'
             },
-            responseType: 'stream',
+            responseType: 'buffer',
         };
 
+        const response = await got(url, Object.assign({}, options, {method: 'HEAD'}));
+
+        let estSize = 0;
+        if (response.headers['content-length']) {
+            estSize = response.headers['content-length'];
+        }
+
+        let prevProg = 0;
+        const request = got(url, options);
+
+        request.on('downloadProgress', progress => {
+            if (this.limitDownloadSize) {
+                if (progress.transferred > this.limitDownloadSize) {
+                    errMes = 'Файл слишком большой';
+                    request.cancel();
+                }
+            }
+
+            let prog = 0;
+            if (estSize)
+                prog = Math.round(progress.transferred/estSize*100);
+            else if (progress.transferred)
+                prog = Math.round(progress.transferred/(progress.transferred + 200000)*100);
+
+            if (prog != prevProg && callback)
+                callback(prog);
+            prevProg = prog;
+
+            if (abort && abort()) {
+                errMes = 'abort';
+                request.cancel();
+            }
+        });
+
         try {
-            const res = await axios.get(url, options);
+            return (await request).body;
-
-            let estSize = 0;
-            if (res.headers['content-length']) {
-                estSize = res.headers['content-length'];
-            }
-
-            if (estSize > this.limitDownloadSize) {
-                throw new Error('Файл слишком большой');
-            }
-
-            let prevProg = 0;
-            let transferred = 0;
-
-            const download = this.streamToBuffer(res.data, (chunk) => {
-                transferred += chunk.length;
-                if (this.limitDownloadSize) {
-                    if (transferred > this.limitDownloadSize) {
-                        errMes = 'Файл слишком большой';
-                        res.request.abort();
-                    }
-                }
-
-                let prog = 0;
-                if (estSize)
-                    prog = Math.round(transferred/estSize*100);
-                else
-                    prog = Math.round(transferred/(transferred + 200000)*100);
-
-                if (prog != prevProg && callback)
-                    callback(prog);
-                prevProg = prog;
-
-                if (abort && abort()) {
-                    errMes = 'abort';
-                    res.request.abort();
-                }
-            });
-
-            return await download;
         } catch (error) {
             errMes = (errMes ? errMes : error.message);
             throw new Error(errMes);
         }
     }
-
-    streamToBuffer(stream, progress) {
-        return new Promise((resolve, reject) => {
-            
-            if (!progress)
-                progress = () => {};
-
-            const _buf = [];
-
-            stream.on('data', (chunk) => {
-                _buf.push(chunk);
-                progress(chunk);
-            });
-            stream.on('end', () => resolve(Buffer.concat(_buf)));
-            stream.on('error', (err) => {
-                reject(err);
-            });
-            stream.on('aborted', () => {
-                reject(new Error('aborted'));
-            });
-        });
-    }
 }
 
 module.exports = FileDownloader;

server/core/Logger.js

@@ -49,7 +49,7 @@ class BaseLog {
         this.outputBuffer = [];
 
         await this.flushImpl(this.data)
-            .catch(e => { console.error(`Logger error: ${e}`); ayncExit.exit(1); } );
+            .catch(e => { console.log(e); ayncExit.exit(1); } );
         this.flushing = false;
     }
 
@@ -188,8 +188,8 @@ class Logger {
         }
 
         this.closed = false;
-        ayncExit.onSignal((signal, err) => {
+        ayncExit.onSignal((signal) => {
-            this.log(LM_FATAL, `Signal "${signal}" received, error: "${(err.stack ? err.stack : err)}", exiting...`);
+            this.log(LM_FATAL, `Signal ${signal} received, exiting...`);
         });
         ayncExit.addAfter(this.close.bind(this));
     }
@@ -218,8 +218,6 @@ class Logger {
         } else {
             console.log(mes);
         }
-
-        return mes;
     }
 
     async close() {

server/core/Reader/BookConverter/textUtils.js

@@ -3,7 +3,7 @@ const chardet = require('chardet');
 function getEncoding(buf) {
     let selected = getEncodingLite(buf);
 
-    if (selected == 'ISO-8859-5' && buf.length > 10) {
+    if (selected == 'ISO-8859-5') {
         const charsetAll = chardet.analyse(buf.slice(0, 20000));
         for (const charset of charsetAll) {
             if (charset.name.indexOf('ISO-8859') < 0) {

server/core/Reader/JembaReaderStorage.js

@@ -2,7 +2,6 @@ const _ = require('lodash');
 
 const utils = require('../utils');
 const JembaConnManager = require('../../db/JembaConnManager');//singleton
-const log = new (require('../AppLogger'))().log;//singleton
 
 let instance = null;
 
@@ -21,30 +20,25 @@ class JembaReaderStorage {
     }
 
     async doAction(act) {
-        try {
+        if (!_.isObject(act.items))
-            if (!_.isObject(act.items))
+            throw new Error('items is not an object');
-                throw new Error('items is not an object');
 
-            let result = {};
+        let result = {};
-            switch (act.action) {
+        switch (act.action) {
-                case 'check':
+            case 'check':
-                    result = await this.checkItems(act.items);
+                result = await this.checkItems(act.items);
-                    break;
+                break;
-                case 'get':
+            case 'get':
-                    result = await this.getItems(act.items);
+                result = await this.getItems(act.items);
-                    break;
+                break;
-                case 'set':
+            case 'set':
-                    result = await this.setItems(act.items, act.force);
+                result = await this.setItems(act.items, act.force);
-                    break;
+                break;
-                default:
+            default:
-                    throw new Error('Unknown action');
+                throw new Error('Unknown action');
-            }
-
-            return result;
-        } catch (e) {
-            log(LM_ERR, `JembaReaderStorage: ${e.message}`);
-            throw e;
         }
+
+        return result;
     }
 
     async checkItems(items) {

server/core/Reader/ReaderWorker.js

@@ -219,27 +219,6 @@ class ReaderWorker {
         return `disk://${hash}`;
     }
 
-    async saveFileBuf(buf) {
-        const hash = await utils.getBufHash(buf, 'sha256', 'hex');
-        const outFilename = `${this.config.uploadDir}/${hash}`;
-
-        if (!await fs.pathExists(outFilename)) {
-            await fs.writeFile(outFilename, buf);
-        } else {
-            await utils.touchFile(outFilename);
-        }
-
-        return `disk://${hash}`;
-    }
-
-    async uploadFileTouch(url) {
-        const outFilename = `${this.config.uploadDir}/${url.replace('disk://', '')}`;
-
-        await utils.touchFile(outFilename);
-
-        return url;
-    }
-
     async restoreRemoteFile(filename) {
         const basename = path.basename(filename);
         const targetName = `${this.config.tempPublicDir}/${basename}`;

server/core/WebSocketConnection.js

@@ -94,7 +94,7 @@ class WebSocketConnection {
                     this.ws = new this.WebSocket(this.url);
                 }
 
-                const onopen = () => {
+                const onopen = (e) => {
                     this.connecting = false;
                     resolve(this.ws);
                 };

server/core/utils.js

@@ -13,7 +13,7 @@ function toBase36(data) {
 }
 
 function fromBase36(data) {
-    return Buffer.from(bs36.decode(data));
+    return bs36.decode(data);
 }
 
 function bufferRemoveZeroes(buf) {
@@ -34,12 +34,6 @@ function getFileHash(filename, hashName, enc) {
     });
 }
 
-function getBufHash(buf, hashName, enc) {
-    const hash = crypto.createHash(hashName);
-    hash.update(buf);
-    return hash.digest(enc);
-}
-
 function sleep(ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
 }
@@ -135,7 +129,6 @@ module.exports = {
     fromBase36,
     bufferRemoveZeroes,
     getFileHash,
-    getBufHash,
     sleep,
     toUnixTime,
     randomHexString,

server/index.js

@@ -11,8 +11,6 @@ const ayncExit = new (require('./core/AsyncExit'))();
 
 let log = null;
 
-const maxPayloadSize = 50;//in MB
-
 async function init() {
     //config
     const configManager = new (require('./config'))();//singleton
@@ -65,7 +63,7 @@ async function main() {
         if (serverCfg.mode !== 'none') {
             const app = express();
             const server = http.createServer(app);
-            const wss = new WebSocket.Server({ server, maxPayload: maxPayloadSize*1024*1024 });
+            const wss = new WebSocket.Server({ server, maxPayload: 10*1024*1024 });
 
             const serverConfig = Object.assign({}, config, serverCfg);
 
@@ -77,7 +75,7 @@ async function main() {
             }
 
             app.use(compression({ level: 1 }));
-            app.use(express.json({limit: `${maxPayloadSize}mb`}));
+            app.use(express.json({limit: '10mb'}));
             if (devModule)
                 devModule.logQueries(app);
 

server/routes.js

@@ -31,6 +31,7 @@ function initRoutes(app, wss, config) {
         ['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