Merge branch 'release/0.11.6'

0.11.5

build/linux.js

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

client/components/ExternalLibs/ExternalLibs.vue

@@ -75,7 +75,7 @@
                     class="col q-mr-sm"
                     rounded outlined dense
                     bg-color="white"
-                    placeholder="Скопируйте сюда URL книги"
+                    placeholder="Скопируйте сюда ссылку на книгу и нажмите 'Открыть'"
                     @focus="selectAllOnFocus" @keydown="bookUrlKeyDown"
                 >
                     <template #prepend>

client/components/Reader/HelpPage/HelpPage.vue

@@ -29,14 +29,14 @@ import CommonHelpPage from './CommonHelpPage/CommonHelpPage.vue';
 import HotkeysHelpPage from './HotkeysHelpPage/HotkeysHelpPage.vue';
 import MouseHelpPage from './MouseHelpPage/MouseHelpPage.vue';
 import VersionHistoryPage from './VersionHistoryPage/VersionHistoryPage.vue';
-import DonateHelpPage from './DonateHelpPage/DonateHelpPage.vue';
+//import DonateHelpPage from './DonateHelpPage/DonateHelpPage.vue';
 
 const pages = {
     'CommonHelpPage': CommonHelpPage,
     'HotkeysHelpPage': HotkeysHelpPage,
     'MouseHelpPage': MouseHelpPage,
     'VersionHistoryPage': VersionHistoryPage,
-    'DonateHelpPage': DonateHelpPage,
+    //'DonateHelpPage': DonateHelpPage,
 };
 
 const tabs = [
@@ -44,7 +44,7 @@ const tabs = [
     ['MouseHelpPage', 'Мышь/тачскрин'],
     ['HotkeysHelpPage', 'Клавиатура'],
     ['VersionHistoryPage', 'История версий'],
-    ['DonateHelpPage', 'Помочь проекту'],
+    //['DonateHelpPage', 'Помочь проекту'],
 ];
 
 const componentOptions = {
@@ -73,7 +73,7 @@ class HelpPage {
     }
 
     activateDonateHelpPage() {
-        this.selectedTab = 'DonateHelpPage';
+        //this.selectedTab = 'DonateHelpPage';
     }
 
     activateVersionHistoryHelpPage() {

client/components/Reader/LoaderPage/LoaderPage.vue

@@ -12,21 +12,31 @@
         </div>
 
         <div class="col-auto column justify-start items-center no-wrap overflow-hidden">
-            <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">
+            <q-input
+                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 id="file" ref="file" type="file" style="display: none;" @change="loadFile" />
+            <input
+                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">
+                <q-icon class="q-mr-xs" name="la la-caret-square-up" size="24px" />
                 Загрузить файл с диска
             </q-btn>
             
             <div class="q-my-sm"></div>
             <q-btn no-caps dense class="q-px-sm" color="primary" size="13px" @click="loadBufferClick">
+                <q-icon class="q-mr-xs" name="la la-comment" size="24px" />
                 Из буфера обмена
             </q-btn>
 
@@ -45,14 +55,27 @@
         </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>
+            <!--span class="bottom-span clickable" @click="openDonate">Помочь проекту</span-->
 
             <span v-if="version == clientVersion" class="bottom-span">v{{ version }}</span>
             <span v-else class="bottom-span">Версия сервера {{ version }}, версия клиента {{ clientVersion }}, необходимо обновить страницу</span>
         </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>
 
@@ -62,12 +85,15 @@ 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';
 
 const componentOptions = {
     components: {
         GithubCorner,
+        Dialog,
         PasteTextPage,
     },
 };
@@ -77,6 +103,7 @@ class LoaderPage {
     bookUrl = null;
     loadPercent = 0;
     pasteTextActive = false;
+    findBookVisible = false;
 
     created() {
         this.commit = this.$store.commit;
@@ -109,6 +136,10 @@ class LoaderPage {
         return this.$store.state.config.version;
     }
 
+    get acceptFileExt() {
+        return this.$store.state.config.acceptFileExt;
+    }
+
     get isExternalConverter() {
         return this.$store.state.config.useExternalBookConverter;
     }
@@ -136,7 +167,7 @@ class LoaderPage {
     }
 
     loadBufferClick() {
-        this.pasteTextToggle();
+        this.showPasteText();
     }
 
     loadBuffer(opts) {
@@ -146,6 +177,10 @@ class LoaderPage {
         }
     }
 
+    showPasteText() {
+        this.pasteTextActive = true;
+    }
+
     pasteTextToggle() {
         this.pasteTextActive = !this.pasteTextActive;
     }
@@ -158,6 +193,10 @@ class LoaderPage {
         this.$emit('do-action', {action: 'donate'});
     }
     
+    findBook() {
+        this.findBookVisible = true;
+    }
+
     openComments() {
         window.open('http://samlib.ru/comment/b/bookpauk/bookpauk_reader', '_blank');
     }
@@ -166,26 +205,24 @@ class LoaderPage {
         window.open('http://old.omnireader.ru', '_blank');
     }
 
-    onInputKeydown(event) {
+    async onInputKeydown(event) {
         if (event.key == 'Enter') {
+            await utils.sleep(100);
             this.submitUrl();
         }
     }
 
     keyHook(event) {
+        if (this.$refs.dialog1.active)
+            return true;
+
         if (this.pasteTextActive) {
             return this.$refs.pasteTextPage.keyHook(event);
         }
 
         const input = this.$refs.input.getNativeElement();
-        if (event.type == 'keydown' && document.activeElement !== input) {
-            const action = this.$root.readerActionByKeyEvent(event);
-            switch (action) {
-                case 'help':
-                    this.openHelp(event);
-                    return true;
-            }
-        }
+        if (event.type == 'keydown' && (document.activeElement === input || event.code == 'Enter') && event.code != 'Escape')
+            return true;
 
         return false;
     }

client/components/Reader/Reader.vue

@@ -2,16 +2,35 @@
     <div class="column no-wrap">
         <div v-show="toolBarActive" ref="header" class="header">
             <div ref="buttons" class="row justify-between no-wrap">
-                <div>
+                <div class="row no-wrap">
                     <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%">
                             {{ rstore.readerActions['loader'] }}
                         </q-tooltip>
                     </button>
+                    <button v-show="showToolButton['loadFile']" ref="loadFile" v-ripple class="tool-button" :class="buttonActiveClass('loadFile')" @click="buttonClick('loadFile')">
+                        <q-icon name="la la-caret-square-up" size="32px" />
+                        <q-tooltip :delay="1500" anchor="bottom right" content-style="font-size: 80%">
+                            {{ rstore.readerActions['loadFile'] }}
+                        </q-tooltip>
+                    </button>
+                    <button v-show="showToolButton['loadBuffer']" ref="loadBuffer" v-ripple class="tool-button" :class="buttonActiveClass('loadBuffer')" @click="buttonClick('loadBuffer')">
+                        <q-icon name="la la-comment" size="32px" />
+                        <q-tooltip :delay="1500" anchor="bottom right" content-style="font-size: 80%">
+                            {{ rstore.readerActions['loadBuffer'] }}
+                        </q-tooltip>
+                    </button>
+                    <button v-show="showToolButton['help']" ref="help" v-ripple class="tool-button" :class="buttonActiveClass('help')" @click="buttonClick('help')">
+                        <q-icon name="la la-question" size="32px" />
+                        <q-tooltip :delay="1500" anchor="bottom right" content-style="font-size: 80%">
+                            {{ rstore.readerActions['help'] }}
+                        </q-tooltip>
+                    </button>
                 </div>
 
-                <div>
+                <div class="row no-wrap">
+                    <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%">
@@ -86,9 +105,16 @@
                             {{ rstore.readerActions['recentBooks'] }}
                         </q-tooltip>
                     </button>
+                    <div class="space"></div>
                 </div>
 
-                <div>
+                <div class="row no-wrap">
+                    <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%">
+                            {{ rstore.readerActions['clickControl'] }}
+                        </q-tooltip>
+                    </button>
                     <button v-show="showToolButton['offlineMode']" ref="offlineMode" v-ripple class="tool-button" :class="buttonActiveClass('offlineMode')" @click="buttonClick('offlineMode')">
                         <q-icon name="la la-unlink" size="32px" />
                         <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
@@ -136,7 +162,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"></ReaderDialogs>
+            <ReaderDialogs ref="dialogs" @donate-toggle="donateToggle" @version-history-toggle="versionHistoryToggle" @load-buffer-toggle="loadBufferToggle"></ReaderDialogs>
         </div>
     </div>
 </template>
@@ -245,6 +271,8 @@ class Reader {
     rstore = {};
 
     loaderActive = false;
+    loadFileActive = false;
+    loadBufferActive = false;
     fullScreenActive = false;
     setPositionActive = false;
     searchActive = false;
@@ -254,6 +282,7 @@ class Reader {
     contentsActive = false;    
     libsActive = false;
     recentBooksActive = false;
+    clickControlActive = false;
     offlineModeActive = false;
     settingsActive = false;
 
@@ -324,8 +353,6 @@ class Reader {
     }
 
     mounted() {
-        this.updateHeaderMinWidth();
-
         (async() => {
             await wallpaperStorage.init();
             await bookManager.init(this.settings);
@@ -372,6 +399,7 @@ class Reader {
         this.copyFullText = settings.copyFullText;
         this.showClickMapPage = settings.showClickMapPage;
         this.clickControl = settings.clickControl;
+        this.clickControlActive = this.clickControl;
         this.blinkCachedLoad = settings.blinkCachedLoad;
         this.showToolButton = settings.showToolButton;
         this.enableSitesFilter = settings.enableSitesFilter;
@@ -388,11 +416,26 @@ class Reader {
             return this.readerActionByKeyCode[utils.keyEventToCode(event)];
         }
 
-        this.updateHeaderMinWidth();
-        
         this.loadWallpapers();//no await
     }
 
+    showHelpOnErrorIfNeeded(errorMessage) {
+        //небольшая эвристика
+        let i = errorMessage.indexOf('http://');
+        if (i < 0)
+            i = errorMessage.indexOf('https://');
+
+        errorMessage = errorMessage.substring(i + 7);
+        const perCount = errorMessage.split('%').length - 1;
+
+        if (perCount > errorMessage.length/3.2) {
+            this.$refs.dialogs.showUrlHelp();
+            return true;
+        }
+
+        return false;
+    }
+
     //wallpaper css
     async loadWallpapers() {
         const wallpaperDataLength = await wallpaperStorage.getLength();
@@ -439,17 +482,6 @@ 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;
 
@@ -657,6 +689,28 @@ class Reader {
         }
     }
 
+    loadFileToggle() {
+        if (!this.loaderActive)
+            this.loaderToggle();
+        this.$nextTick(() => {
+            const page = this.$refs.page;
+            if (this.activePage == 'LoaderPage' && page.loadFileClick) {
+                page.loadFileClick();
+            }
+        });        
+    }
+
+    loadBufferToggle() {
+        if (!this.loaderActive)
+            this.loaderToggle();
+        this.$nextTick(() => {
+            const page = this.$refs.page;
+            if (this.activePage == 'LoaderPage' && page.showPasteText) {
+                page.showPasteText();
+            }
+        });        
+    }
+
     setPositionToggle() {
         this.setPositionActive = !this.setPositionActive;
         const page = this.$refs.page;
@@ -784,6 +838,12 @@ class Reader {
         }
     }
 
+    clickControlToggle() {
+        const newSettings = _.cloneDeep(this.settings);
+        newSettings.clickControl = !this.clickControl;
+        this.commit('reader/setSettings', newSettings);
+    }
+
     offlineModeToggle() {
         this.offlineModeActive = !this.offlineModeActive;
         this.$refs.serverStorage.offlineModeActive = this.offlineModeActive;
@@ -872,6 +932,9 @@ class Reader {
 
         switch (action) {
             case 'loader':
+            case 'loadFile':
+            case 'loadBuffer':
+            case 'help':
             case 'fullScreen':
             case 'setPosition':
             case 'search':
@@ -881,6 +944,7 @@ class Reader {
             case 'contents':
             case 'libs':
             case 'recentBooks':
+            case 'clickControl':
             case 'offlineMode':
             case 'settings':
                 if (this.progressActive) {
@@ -1117,7 +1181,9 @@ class Reader {
         } catch (e) {
             progress.hide(); this.progressActive = false;
             this.loaderActive = true;
-            this.$root.stdDialog.alert(e.message, 'Ошибка', {color: 'negative'});
+            if (!this.showHelpOnErrorIfNeeded(e.message)) {
+                this.$root.stdDialog.alert(e.message, 'Ошибка', {color: 'negative'});
+            }
         } finally {
             this.checkNewVersionAvailable();
         }
@@ -1183,6 +1249,12 @@ class Reader {
             case 'loader':
                 this.loaderToggle();
                 break;
+            case 'loadFile':
+                this.loadFileToggle();
+                break;
+            case 'loadBuffer':
+                this.loadBufferToggle();
+                break;
             case 'help':
                 this.helpToggle();
                 break;
@@ -1225,6 +1297,9 @@ class Reader {
             case 'recentBooks':
                 this.recentBooksToggle();
                 break;
+            case 'clickControl':
+                this.clickControlToggle();
+                break;
             case 'offlineMode':
                 this.offlineModeToggle();
                 break;
@@ -1327,13 +1402,14 @@ class Reader {
             if (!result && event.type == 'keydown') {
                 const action = this.$root.readerActionByKeyEvent(event);
 
-                if (action == 'loader') {
+                /*if (action == 'loader') {
                     result = this.doAction({action, event});
                 }
 
                 if (!result && this.activePage == 'TextPage') {
                     result = this.doAction({action, event});
-                }
+                }*/
+                result = this.doAction({action, event});
             }
         }
         return result;
@@ -1346,12 +1422,33 @@ export default vueComponent(Reader);
 
 <style scoped>
 .header {
+    height: 50px;
     padding-left: 5px;
     padding-right: 5px;
     background-color: #1B695F;
     color: #000;
-    overflow: hidden;
-    height: 50px;
+    overflow-x: auto;
+    overflow-y: hidden;
+    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,9 +54,9 @@
 
                 <br><br>
                 <div class="row justify-center">
-                    <q-btn class="q-px-sm" color="primary" dense no-caps rounded @click="openDonate">
+                    <!--q-btn class="q-px-sm" color="primary" dense no-caps rounded @click="openDonate">
                         Помочь проекту
-                    </q-btn>
+                    </q-btn-->
                 </div>
             </div>
 
@@ -68,6 +68,27 @@
                 </q-btn>
             </template>
         </Dialog>
+
+        <Dialog ref="dialog3" v-model="urlHelpVisible">
+            <template #header>
+                Обнаружена невалидная ссылка в поле "URL книги".
+                <br>
+            </template>
+
+            <div style="word-break: normal">
+                Если вы хотите найти определенную книгу и открыть в читалке, добро пожаловать в
+                раздел "Сетевая библиотека" (кнопка <q-icon name="la la-sitemap" size="32px" />) на сайте
+                <a href="https://liberama.top" target="_blank">liberama.top</a>
+
+                <br><br>
+                Если же вы пытаетесь вставить текст в читалку из буфера обмена, пожалуйста воспользуйтесь кнопкой
+                <q-btn no-caps dense class="q-px-sm" color="primary" size="13px" @click="loadBufferClick">
+                    <q-icon class="q-mr-xs" name="la la-comment" size="24px" />
+                    Из буфера обмена
+                </q-btn>
+                на странице загрузки.
+            </div>
+        </Dialog>
     </div>
 </template>
 
@@ -95,6 +116,7 @@ class ReaderDialogs {
     whatsNewVisible = false;
     whatsNewContent = '';
     donationVisible = false;
+    urlHelpVisible = false;
 
     created() {
         this.commit = this.$store.commit;
@@ -135,6 +157,15 @@ class ReaderDialogs {
         }
     }
 
+    async showUrlHelp() {
+        this.urlHelpVisible = true;
+    }
+
+    loadBufferClick() {
+        this.$emit('load-buffer-toggle');
+        this.urlHelpVisible = false;
+    }
+
     donationDialogDisable() {
         this.donationVisible = false;
         if (this.showDonationDialog2020) {
@@ -191,7 +222,7 @@ class ReaderDialogs {
     }
 
     keyHook() {
-        if (this.$refs.dialog1.active || this.$refs.dialog2.active)
+        if (this.$refs.dialog1.active || this.$refs.dialog2.active || this.$refs.dialog3.active)
             return true;
         return false;
     }

client/components/Reader/ServerStorage/ServerStorage.vue

@@ -728,10 +728,10 @@ 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])] = decoded;
+                items[utils.fromBase58(ids[1]).toString()] = decoded;
             }
         }
-
+        
         result.items = items;
         return result;
     }

client/components/Reader/TextPage/TextPage.vue

@@ -6,29 +6,32 @@
         </div>
         <div ref="scrollBox1" class="layout over-hidden" @wheel.prevent.stop="onMouseWheel">
             <div ref="scrollingPage1" class="layout over-hidden" @transitionend="onPage1TransitionEnd" @animationend="onPage1AnimationEnd">
-                <div v-html="page1"></div>
+                <div @copy.prevent="copyText" 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 v-html="page2"></div>
+                <div @copy.prevent="copyText" v-html="page2"></div>
             </div>
         </div>
         <div v-show="showStatusBar" ref="statusBar" class="layout">
             <div v-html="statusBar"></div>
         </div>
-        <div v-show="clickControl" ref="layoutEvents" class="layout events" 
+        <div
+            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 v-show="showStatusBar && statusBarClickOpen" @mousedown.prevent.stop @touchstart.stop
+            <div
+                v-show="showStatusBar && statusBarClickOpen" @mousedown.prevent.stop @touchstart.stop
                 @click.prevent.stop="onStatusBarClick"
                 v-html="statusBarClickable"
             ></div>
         </div>
-        <div v-show="!clickControl && showStatusBar && statusBarClickOpen" class="layout" 
+        <div
+            v-show="!clickControl && showStatusBar && statusBarClickOpen" class="layout" 
             @mousedown.prevent.stop @touchstart.stop
             @click.prevent.stop="onStatusBarClick"
             v-html="statusBarClickable"
@@ -46,6 +49,7 @@ import vueComponent from '../../vueComponent.js';
 
 import {loadCSS} from 'fg-loadcss';
 import _ from 'lodash';
+import he from 'he';
 
 import './TextPage.css';
 
@@ -1201,8 +1205,54 @@ 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/versionHistory.js

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

client/share/utils.js

@@ -90,7 +90,7 @@ export function toBase58(data) {
 }
 
 export function fromBase58(data) {
-    return bs58.decode(data);
+    return Buffer.from(bs58.decode(data));
 }
 
 //base-x слишком тормозит, используем sjcl
@@ -107,6 +107,10 @@ export function fromBase64(data) {
     ));
 }
 
+export function hasProp(obj, prop) {
+    return Object.prototype.hasOwnProperty.call(obj, prop);
+}
+
 export function getObjDiff(oldObj, newObj, opts = {}) {
     const {
         exclude = [],
@@ -126,7 +130,7 @@ export function getObjDiff(oldObj, newObj, opts = {}) {
         for (const key of Object.keys(oldObj)) {
             const kp = `${keyPath}${key}`;
 
-            if (newObj.hasOwnProperty(key)) {
+            if (Object.prototype.hasOwnProperty.call(newObj, key)) {
                 if (ex.has(kp))
                     continue;
 
@@ -149,7 +153,7 @@ export function getObjDiff(oldObj, newObj, opts = {}) {
             if (exAdd.has(kp))
                 continue;
 
-            if (!oldObj.hasOwnProperty(key)) {
+            if (!Object.prototype.hasOwnProperty.call(oldObj, key)) {
                 result.add[key] = _.cloneDeep(newObj[key]);
             }
         }
@@ -213,7 +217,7 @@ export function applyObjDiff(obj, diff, opts = {}) {
 
     const change = diff.change;
     for (const key of Object.keys(change)) {
-        if (result.hasOwnProperty(key)) {
+        if (Object.prototype.hasOwnProperty.call(result, key)) {
             if (_.isObject(change[key])) {
                 result[key] = applyObjDiff(result[key], change[key], opts);
             } else {

client/store/modules/reader.js

@@ -2,8 +2,10 @@ import * as utils from '../../share/utils';
 import googleFonts from './fonts/fonts.json';
 
 const readerActions = {
-    'help': 'Вызвать cправку',
     'loader': 'На страницу загрузки',
+    'loadFile': 'Загрузить файл с диска',
+    'loadBuffer': 'Загрузить из буфера обмена',
+    'help': 'Вызвать cправку',    
     'settings': 'Настроить',
     'undoAction': 'Действие назад',
     'redoAction': 'Действие вперед',
@@ -15,6 +17,7 @@ const readerActions = {
     'copyText': 'Скопировать текст со страницы',
     'convOptions': 'Настроить конвертирование',
     'refresh': 'Принудительно обновить книгу',
+    'clickControl': 'Управление кликом',
     'offlineMode': 'Автономный режим (без интернета)',
     'contents': 'Оглавление/закладки',
     'libs': 'Сетевая библиотека',
@@ -35,6 +38,9 @@ const readerActions = {
 
 //readerActions[name]
 const toolButtons = [
+    {name: 'loadFile',    show: true},
+    {name: 'loadBuffer',  show: true},    
+    {name: 'help',        show: true},
     {name: 'undoAction',  show: true},
     {name: 'redoAction',  show: true},
     {name: 'fullScreen',  show: true},
@@ -47,13 +53,16 @@ const toolButtons = [
     {name: 'contents',    show: true},
     {name: 'libs',        show: true},
     {name: 'recentBooks', show: true},
+    {name: 'clickControl', show: false},
     {name: 'offlineMode', show: false},
 ];
 
 //readerActions[name]
 const hotKeys = [
-    {name: 'help', codes: ['F1', 'H']},
     {name: 'loader', codes: ['Escape']},
+    {name: 'loadFile', codes: ['F3']},
+    {name: 'loadBuffer', codes: ['F4']},
+    {name: 'help', codes: ['F1', 'H']},
     {name: 'settings', codes: ['S']},
     {name: 'undoAction', codes: ['Ctrl+BracketLeft']},
     {name: 'redoAction', codes: ['Ctrl+BracketRight']},
@@ -61,12 +70,13 @@ const hotKeys = [
     {name: 'scrolling', codes: ['Z']},
     {name: 'setPosition', codes: ['P']},
     {name: 'search', codes: ['Ctrl+F']},
-    {name: 'copyText', codes: ['Ctrl+C']},    
+    {name: 'copyText', codes: ['Ctrl+Space']},    
     {name: 'convOptions', codes: ['Ctrl+M']},
     {name: 'refresh', codes: ['R']},
     {name: 'contents', codes: ['C']},
     {name: 'libs', codes: ['L']},
     {name: 'recentBooks', codes: ['X']},
+    {name: 'clickControl', codes: ['Ctrl+B']},
     {name: 'offlineMode', codes: ['O']},
 
     {name: 'switchToolbar', codes: ['Tab', 'Q']},

docs/liberama.top/liberama

@@ -140,5 +140,6 @@ server {
 
   location / {
     proxy_pass http://fantasy-worlds.org;
+    proxy_hide_header x-frame-options;
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Liberama",
-  "version": "0.11.3",
+  "version": "0.11.6",
   "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": "^9.1.0",
+    "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.5.1",
-    "css-minimizer-webpack-plugin": "^3.1.3",
-    "eslint": "^8.2.0",
-    "eslint-plugin-vue": "^8.0.3",
+    "css-minimizer-webpack-plugin": "^4.0.0",
+    "eslint": "^8.19.0",
+    "eslint-plugin-vue": "^9.1.1",
     "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": "^8.0.1",
-    "vue-loader": "^16.8.3",
+    "vue-eslint-parser": "^9.0.3",
+    "vue-loader": "^17.0.0",
     "vue-style-loader": "^4.1.3",
     "webpack": "^5.64.1",
     "webpack-cli": "^4.9.1",
@@ -50,17 +50,16 @@
   "dependencies": {
     "@quasar/extras": "^1.12.0",
     "@vue/compat": "^3.2.21",
-    "axios": "^0.24.0",
-    "base-x": "^3.0.9",
+    "axios": "^0.27.2",
+    "base-x": "^4.0.0",
     "chardet": "^1.4.0",
     "compression": "^1.7.4",
     "express": "^4.17.1",
     "fg-loadcss": "^3.1.0",
-    "fs-extra": "^9.0.1",
-    "got": "^11.8.2",
+    "fs-extra": "^10.1.0",
     "he": "^1.2.0",
     "iconv-lite": "^0.6.3",
-    "jembadb": "^2.3.0",
+    "jembadb": "^3.0.6",
     "localforage": "^1.10.0",
     "lodash": "^4.17.21",
     "minimist": "^1.2.5",

server/config/base.js

@@ -22,7 +22,8 @@ module.exports = {
     maxUploadPublicDirSize: 200*1024*1024,//100Мб
 
     useExternalBookConverter: false,
-    webConfigParams: ['name', 'version', 'mode', 'maxUploadFileSize', 'useExternalBookConverter', 'branch'],
+    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', 'acceptFileExt', 'branch'],
 
     db: [
         {
@@ -48,7 +49,7 @@ module.exports = {
     servers: [
         {
             serverName: '1',
-            mode: 'normal', //'none', 'normal', 'site', 'reader', 'omnireader'
+            mode: 'normal', //'none', 'normal', 'site', 'reader', 'omnireader', 'liberama.top'
             ip: '0.0.0.0',
             port: '33080',
         },

server/controllers/WorkerController.js

@@ -25,60 +25,7 @@ class WorkerController extends BaseController {
         res.status(400).send({error});
         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) => {
+        const runSingalCallbacks = async(signal, err, origin) => {
             for (const signalCallback of this.onSignalCallbacks.keys()) {
                 try {
-                    await signalCallback(signal);
+                    await signalCallback(signal, err, origin);
                 } catch(e) {
                     console.error(e);
                 }
@@ -32,8 +32,8 @@ class AsyncExit {
         };
 
         for (const signal of signals) {
-            process.once(signal, async() => {
-                await runSingalCallbacks(signal);
+            process.once(signal, async(err, origin) => {
+                await runSingalCallbacks(signal, err, origin);
                 this.exit(codeOnSignal);
             });
         }

server/core/FileDownloader.js

@@ -1,4 +1,4 @@
-const got = require('got');
+const axios = require('axios');
 
 class FileDownloader {
     constructor(limitDownloadSize = 0) {
@@ -7,54 +7,82 @@ 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: 'buffer',
+            responseType: 'stream',
         };
 
-        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 {
-            return (await request).body;
+            const res = await axios.get(url, options);
+
+            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;
+module.exports = FileDownloader;

server/core/Logger.js

@@ -188,8 +188,8 @@ class Logger {
         }
 
         this.closed = false;
-        ayncExit.onSignal((signal) => {
-            this.log(LM_FATAL, `Signal ${signal} received, exiting...`);
+        ayncExit.onSignal((signal, err) => {
+            this.log(LM_FATAL, `Signal "${signal}" received, error: "${(err.stack ? err.stack : err)}", exiting...`);
         });
         ayncExit.addAfter(this.close.bind(this));
     }

server/core/utils.js

@@ -13,7 +13,7 @@ function toBase36(data) {
 }
 
 function fromBase36(data) {
-    return bs36.decode(data);
+    return Buffer.from(bs36.decode(data));
 }
 
 function bufferRemoveZeroes(buf) {

server/routes.js

@@ -31,7 +31,6 @@ 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