Merge branch 'release/1.2.3'

1.2.3
Версия 1.2.3
2024-08-02 15:22:24 +07:00 · 2024-08-02 15:22:07 +07:00 · 2024-08-02 15:21:43 +07:00 · 2024-08-02 15:15:54 +07:00 · 2024-07-31 11:44:07 +07:00 · 2024-07-31 11:30:31 +07:00
16 changed files with 5110 additions and 4027 deletions
--- a/README.md
+++ b/README.md
@@ -115,6 +115,10 @@ Options:

    // Подключение себя, как клиента, к серверу обновлений
    "bucServer": false
+
+    // Сcылка для открытия в новом окне брауpера по клику на кнопку "Сетевая библиотека"
+    // Если не задано, открывается внутренний менеджер библиотек с использванием фрейма
+    "networkLibraryLink": "http://samlib.ru/"
 }
 ```

--- a/client/api/misc.js
+++ b/client/api/misc.js
@@ -4,7 +4,7 @@ class Misc {
    async loadConfig() {

        const query = {params: [
-            'name', 'version', 'mode', 'maxUploadFileSize', 'useExternalBookConverter', 'acceptFileExt', 'bucEnabled', 'branch',
+            'name', 'version', 'mode', 'maxUploadFileSize', 'useExternalBookConverter', 'acceptFileExt', 'bucEnabled', 'branch', 'networkLibraryLink',
        ]};

        const config = await wsc.message(await wsc.send(Object.assign({action: 'get-config'}, query)));
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -1032,6 +1032,11 @@ class Reader {
    }

    libsToogle() {
+        if (this.config.networkLibraryLink) {
+            window.open(this.config.networkLibraryLink, '_blank');
+            return;
+        }
+
        this.libsActive = !this.libsActive;
        if (this.libsActive) {
            this.$refs.libsPage.init();//no await
@@ -1379,6 +1384,7 @@ class Reader {
                found = (found ? _.cloneDeep(found) : found);

                if (found) {
+                    //если такой файл уже не загружен (path не совпадают)
                    if (wasOpened.sameBookKey != found.sameBookKey) {
                        //спрашиваем, надо ли объединить файлы
                        const askResult = bookManager.keysEqual(found.path, addedBook.path) || 
--- a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
+++ b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue
@@ -201,7 +201,7 @@

                        <div
                            class="del-button self-end row justify-center items-center clickable"
-                            @click="handleDel(item.key)"
+                            @click="handleDel(item)"
                        >
                            <q-icon class="la la-times" size="12px" />
                            <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
@@ -212,7 +212,7 @@
                        <div
                            v-show="showArchive"
                            class="restore-button self-start row justify-center items-center clickable"
-                            @click="handleRestore(item.key)"
+                            @click="handleRestore(item)"
                        >
                            <q-icon class="la la-arrow-left" size="14px" />
                            <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
@@ -593,26 +593,51 @@ class RecentBooksPage {
        }
    }

-    async handleDel(key) {
-        if (!this.showArchive) {
-            await bookManager.delRecentBook({key});
-            this.$root.notify.info('Перенесено в архив');
+    async handleDel(item) {
+        if (item.group?.length) {
+            const keys = [{key: item.key}];
+            for (const book of item.group)
+                keys.push({key: book.key});
+
+            if (!this.showArchive) {
+                await bookManager.delRecentBooks(keys);
+                this.$root.notify.info(`Группа книг (всего ${keys.length}) перенесена в архив`);
+            } else {
+                if (await this.$root.stdDialog.confirm(`Подтвердите удаление группы книг (всего ${keys.length}) из архива:`, ' ')) {
+                    await bookManager.delRecentBooks(keys, 2);
+                    this.$root.notify.info('Группа книг удалена безвозвратно');
+                }
+            }
        } else {
-            if (await this.$root.stdDialog.confirm('Подтвердите удаление из архива:', ' ')) {
-                await bookManager.delRecentBook({key}, 2);
-                this.$root.notify.info('Удалено безвозвратно');
+            if (!this.showArchive) {
+                await bookManager.delRecentBooks([{key: item.key}]);
+                this.$root.notify.info('Книга перенесена в архив');
+            } else {
+                if (await this.$root.stdDialog.confirm('Подтвердите удаление книги из архива:', ' ')) {
+                    await bookManager.delRecentBooks([{key: item.key}], 2);
+                    this.$root.notify.info('Книга удалена безвозвратно');
+                }
            }
        }
    }

-    async handleRestore(key) {
-        await bookManager.restoreRecentBook({key});
-        this.$root.notify.info('Восстановлено из архива');
+    async handleRestore(item) {
+        if (item.group?.length) {
+            const keys = [{key: item.key}];
+            for (const book of item.group)
+                keys.push({key: book.key});
+
+            await bookManager.restoreRecentBooks(keys);
+            this.$root.notify.info(`Группа книг (всего ${keys.length}) восстановлена из архива`);
+        } else {
+            await bookManager.restoreRecentBooks([{key: item.key}]);
+            this.$root.notify.info('Книга восстановлена из архива');
+        }
    }

    async loadBook(item, force = false) {
        if (item.deleted)
-            await this.handleRestore(item.key);
+            await this.handleRestore(item);

        this.$emit('load-book', {url: item.url, path: item.path, force});
        this.close();
--- a/client/components/Reader/TextPage/DrawHelper.js
+++ b/client/components/Reader/TextPage/DrawHelper.js
@@ -14,6 +14,11 @@ export default class DrawHelper {
        return this.context.measureText(text).width;
    }

+    measureTextMetrics(text, style) {// eslint-disable-line no-unused-vars
+        this.context.font = this.fontByStyle(style);
+        return this.context.measureText(text);
+    }
+
    measureTextFont(text, font) {// eslint-disable-line no-unused-vars
        this.context.font = font;
        return this.context.measureText(text).width;
@@ -46,7 +51,22 @@ export default class DrawHelper {
            tOpen += (part.style.italic ? '<i>' : '');
            tOpen += (part.style.sup ? '<span style="vertical-align: baseline; position: relative; line-height: 0; top: -0.3em">' : '');
            tOpen += (part.style.sub ? '<span style="vertical-align: baseline; position: relative; line-height: 0; top: 0.3em">' : '');
+            if (part.style.note) {
+                const t = part.text;
+                const m = this.measureTextMetrics(t, part.style);
+                const d = this.fontSize - 1.1*m.fontBoundingBoxAscent;
+                const w = m.width;
+                const size = (this.fontSize > 18 ?  this.fontSize : 18);
+                const pad = size/2;
+                const btnW = (w >= size ? w : size) + pad*2;
+
+                tOpen += `<span style="position: relative;">` +
+                    `<span style="position: absolute; background-color: ${this.textColor}; opacity: 0.1; cursor: pointer; pointer-events: auto; ` +
+                    `height: ${this.fontSize + pad*2}px; padding: ${pad}px; left: -${(btnW - w)/2 - pad*0.05}px; top: -${pad + d}px; width: ${btnW}px; border-radius: ${size}px;" ` +
+                    `onclick="onNoteClickLiberama('${part.style.note.id}', ${part.style.note.orig ? 1 : 0})"><span style="visibility: hidden;" class="dborder">${t}</span></span>`;
+            }
            let tClose = '';
+            tClose += (part.style.note ? '</span>' : '');
            tClose += (part.style.sub ? '</span>' : '');
            tClose += (part.style.sup ? '</span>' : '');
            tClose += (part.style.italic ? '</i>' : '');
--- a/client/components/Reader/TextPage/TextPage.vue
+++ b/client/components/Reader/TextPage/TextPage.vue
@@ -4,12 +4,12 @@
            <div class="absolute" v-html="background"></div>
            <div class="absolute" v-html="pageDivider"></div>
        </div>
-        <div ref="scrollBox1" class="layout over-hidden" @wheel.prevent.stop="onMouseWheel">
+        <div ref="scrollBox1" class="scroll-box 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>
        </div>
-        <div ref="scrollBox2" class="layout over-hidden" @wheel.prevent.stop="onMouseWheel">
+        <div ref="scrollBox2" class="scroll-box 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>
@@ -21,17 +21,13 @@
            v-show="clickControl" ref="layoutEvents" class="layout events" 
            oncontextmenu="return false;"
            @mousedown.prevent.stop="onMouseDown" @mouseup.prevent.stop="onMouseUp"
+            @mouseover.prevent.stop="onMouseEvent" @mouseout.prevent.stop="onMouseEvent" @mousemove.prevent.stop="onMouseEvent"
            @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
-                @click.prevent.stop="onStatusBarClick"
-                v-html="statusBarClickable"
-            ></div>
        </div>
        <div
-            v-show="!clickControl && showStatusBar && statusBarClickOpen" class="layout" 
+            v-show="showStatusBar && statusBarClickOpen" class="layout" 
            @mousedown.prevent.stop @touchstart.stop
            @click.prevent.stop="onStatusBarClick"
            v-html="statusBarClickable"
@@ -40,6 +36,29 @@
        <!-- невидимым делать нельзя (display: none), вовремя не подгружаютя шрифты -->
        <canvas ref="offscreenCanvas" class="layout" style="visibility: hidden"></canvas>
        <div ref="measureWidth" style="position: absolute; visibility: hidden"></div>
+
+        <!-- Примечание -->
+        <Dialog ref="dialog1" v-model="noteDialogVisible">
+            <template #header>
+                {{ noteTitle }}
+            </template>
+
+            <div class="column col" style="line-height: 20px; max-width: 400px; max-height: 200px; overflow-x: hidden; overflow-y: auto">
+                <div v-html="noteHtml"></div>
+            </div>
+
+            <template #footer>
+                <div class="row col">
+                    <q-btn class="q-px-md q-mr-md" color="btn2" text-color="app" dense no-caps @click="goToNotes">
+                        В примечания
+                    </q-btn>
+                </div>
+
+                <q-btn class="q-px-md" color="btn2" text-color="app" dense no-caps @click="noteDialogVisible = false">
+                    OK
+                </q-btn>
+            </template>
+        </Dialog>
    </div>
 </template>

@@ -51,6 +70,7 @@ import {loadCSS} from 'fg-loadcss';
 import _ from 'lodash';
 import he from 'he';

+import Dialog from '../../share/Dialog.vue';
 import './TextPage.css';

 import * as utils from '../../../share/utils';
@@ -62,7 +82,19 @@ import {clickMap} from '../share/clickMap';

 const minLayoutWidth = 100;

+//обработчик кликов по примечаниям, см. DrawHelper
+//коряво, но иначе придется сильно усложнять рендеринг страниц (через Vue)
+window.onNoteClickLiberama = (noteId, orig) => {
+    const textPage = window.textPageLiberama;
+    if (textPage) {
+        textPage.showNote(noteId, orig);
+    }
+}
+
 const componentOptions = {
+    components: {
+        Dialog
+    },
    watch: {
        bookPos: function() {
            this.$emit('book-pos-changed', {bookPos: this.bookPos, bookPosSeen: this.bookPosSeen});
@@ -90,6 +122,7 @@ class TextPage {
    _options = componentOptions;

    showStatusBar = false;
+    statusBarClickOpen = false;
    clickControl = true;

    background = null;
@@ -114,6 +147,11 @@ class TextPage {

    meta = null;

+    noteDialogVisible = false;
+    noteId = '';
+    noteTitle = '';
+    noteHtml = '';
+
    created() {
        this.drawHelper = new DrawHelper();

@@ -153,6 +191,8 @@ class TextPage {
            await utils.sleep(200);
            this.$nextTick(this.onResize);
        });
+
+        window.textPageLiberama = this;
    }

    mounted() {
@@ -297,6 +337,8 @@ class TextPage {
            top += this.statusBarHeight*(this.statusBarTop ? 1 : 0);
        let page1 = this.$refs.scrollBox1.style;
        let page2 = this.$refs.scrollBox2.style;
+
+        page1.pointerEvents = page2.pointerEvents = (this.clickControl ? 'none' : 'auto'); 
        
        page1.perspective = page2.perspective = '3072px';

@@ -913,6 +955,22 @@ class TextPage {
        }
    }

+    doPara(paraIndex) {
+        const para = this.parsed.para[paraIndex];
+
+        if (para && this.pageLineCount > 0) {
+            const lines = this.parsed.getLines(para.offset, this.pageLineCount);
+
+            if (lines.length >= this.pageLineCount) {
+                this.currentAnimation = this.pageChangeAnimation;
+                this.pageChangeDirectionDown = true;
+                this.userBookPosChange = true;
+                this.bookPos = lines[0].begin;
+            } else 
+                this.doEnd();
+        }
+    }
+
    doToolBarToggle(event) {
        this.$emit('do-action', {action: 'switchToolbar', event});
    }
@@ -1016,6 +1074,7 @@ class TextPage {
        if (this.startTouch) {
            event.preventDefault();
        }
+        this.endClickRepeat();
    }

    onTouchEnd(event) {
@@ -1100,6 +1159,9 @@ class TextPage {
    onMouseWheel(event) {
        if (this.$root.isMobileDevice)
            return;
+
+        this.endClickRepeat();
+        
        if (event.deltaY > 0) {
            this.doDown();
        } else if (event.deltaY < 0) {
@@ -1107,6 +1169,12 @@ class TextPage {
        }
    }

+    onMouseEvent() {
+        if (this.$root.isMobileDevice)
+            return;
+        this.endClickRepeat();
+    }
+
    onStatusBarClick() {
        const url = this.meta.url;
        if (url && url.indexOf('disk://') != 0) {
@@ -1209,6 +1277,43 @@ class TextPage {

        event.clipboardData.setData('text/plain', filtered);
    }
+
+    showNote(noteId, orig) {
+        const note = this.parsed.notes[noteId];
+        if (note) {
+            if (orig) {//show dialog
+                this.noteId = noteId;
+                this.noteTitle = `[${note.title?.trim()}]`;
+                this.noteHtml = note.xml
+                    .replace(/<p>/g, '<p class="note-para">')
+                    .replace(/<stanza>/g, '<br>').replace(/<\/stanza>/g, '')
+                    .replace(/<v>/g, '<p style="margin: 0">').replace(/<\/v>/g, '</p>')
+                    .replace(/<emphasis>/g, '<em>').replace(/<\/emphasis>/g, '</em>')
+                    .replace(/<text-author>/g, '<br>').replace(/<\/text-author>/g, '')
+                ;
+
+                this.noteDialogVisible = true;
+            } else {//go to orig
+                this.goToOrigNote(noteId);
+            }
+        }
+    }
+
+    goToNotes() {
+        const note = this.parsed.notes[this.noteId];
+        if (note && note.noteParaIndex >= 0) {
+            this.doPara(note.noteParaIndex);
+            this.noteDialogVisible = false;
+        }
+    }
+
+    goToOrigNote(noteId) {
+        const note = this.parsed.notes[noteId];
+        if (note && note.linkParaIndex >= 0) {
+            this.doPara(note.linkParaIndex);
+            this.noteDialogVisible = false;
+        }
+    }
 }

 export default vueComponent(TextPage);
@@ -1244,8 +1349,15 @@ export default vueComponent(TextPage);
 }

 .events {
-    z-index: 20;
+    z-index: 9;
    background-color: rgba(0,0,0,0);
 }

 </style>
+<style>
+.note-para {
+    margin: 0;
+    padding: 0;
+    margin-bottom: 10px;
+}
+</style>
--- a/client/components/Reader/share/BookParser.js
+++ b/client/components/Reader/share/BookParser.js
@@ -86,17 +86,24 @@ export default class BookParser {
        let binaryType = '';
        let dimPromises = [];
        this.coverPageId = '';
+        this.images = [];
+        let imageNum = 0;
+
+        //примечания
+        this.notes = {};
+        let inNote = false;
+        let noteId = '';
+        let inNotesBody = false;
+        const noteTags = new Set(['p', 'poem', 'stanza', 'v', 'text-author', 'emphasis']);

        //оглавление
        this.contents = [];
-        this.images = [];
        let curTitle = {paraIndex: -1, title: '', subtitles: []};
        let curSubtitle = {paraIndex: -1, title: ''};
        let inTitle = false;
        let inSubtitle = false;
        let sectionLevel = 0;
        let bodyIndex = 0;
-        let imageNum = 0;

        let paraIndex = -1;
        let paraOffset = 0;
@@ -289,7 +296,7 @@ export default class BookParser {
                if (attrs.href && attrs.href.value) {
                    const href = attrs.href.value;
                    const alt = (attrs.alt && attrs.alt.value ? attrs.alt.value : '');
-                    const {id, local} = this.imageHrefToId(href);
+                    const {id, local} = this.hrefToId(href);
                    if (local) {//local
                        imageNum++;

@@ -322,6 +329,23 @@ export default class BookParser {
                }
            }

+            if (tag == 'a') {
+                let attrs = sax.getAttrsSync(tail);
+                if (attrs.href && attrs.href.value && attrs.type && attrs.type.value === 'note') {//note
+                    const href = attrs.href.value;
+                    const {id, local} = this.hrefToId(href);
+
+                    if (local) {
+                        inNote = true;
+                        growParagraph(`<note href="${id}" orig="1">`, 0);
+
+                        if (!this.notes[id]) {
+                            this.notes[id] = {id, linkParaIndex: paraIndex};
+                        }
+                    }
+                }
+            }
+
            if (path == '/fictionbook/description/title-info/author') {
                if (!fb2.author)
                    fb2.author = [];
@@ -350,6 +374,11 @@ export default class BookParser {

            if (path.indexOf('/fictionbook/body') == 0) {
                if (tag == 'body') {
+                    let attrs = sax.getAttrsSync(tail);
+                    if (attrs.name && attrs.name.value === 'notes') {//notes
+                        inNotesBody = true;
+                    }
+
                    if (isFirstBody && fb2.annotation) {
                        const ann = fb2.annotation.split('<p>').filter(v => v).map(v => utils.removeHtmlTags(v));
                        ann.forEach(a => {
@@ -373,6 +402,31 @@ export default class BookParser {
                    bodyIndex++;
                }

+                if (tag == 'section') {
+                    if (!isFirstSection)
+                        newParagraph();
+                    isFirstSection = false;
+                    sectionLevel++;
+
+                    if (inNotesBody) {
+                        let attrs = sax.getAttrsSync(tail);
+                        if (attrs.id && attrs.id.value) {//notes
+                            const id = attrs.id.value;
+                            let note = this.notes[id];
+                            if (!note) {
+                                note = {id};
+                                this.notes[id] = note;
+                            }
+
+                            note.noteParaIndex = paraIndex;
+                            note.xml = '';
+                            note.title = '';
+                            noteId = id;
+                        }
+
+                    }
+                }
+
                if (tag == 'title') {
                    newParagraph();
                    isFirstTitlePara = true;
@@ -384,13 +438,6 @@ export default class BookParser {
                    this.contents.push(curTitle);
                }

-                if (tag == 'section') {
-                    if (!isFirstSection)
-                        newParagraph();
-                    isFirstSection = false;
-                    sectionLevel++;
-                }
-
                if (tag == 'emphasis' || tag == 'strong' || tag == 'sup' || tag == 'sub') {
                    growParagraph(`<${tag}>`, 0);
                }
@@ -401,6 +448,10 @@ export default class BookParser {
                    if (tag == 'p') {
                        inPara = true;
                        isFirstTitlePara = false;
+
+                        if (inTitle && inNotesBody && noteId) {
+                            growParagraph(`<note href="${noteId}">`, 0);
+                        }
                    }
                }

@@ -434,17 +485,30 @@ export default class BookParser {
                    bold = true;
                    space += 1;
                }
+
+                if (!inTitle && inNotesBody && noteId && noteTags.has(tag)) {
+                    this.notes[noteId].xml += `<${tag}>`;
+                }
            }
        };

        const onEndNode = (elemName) => {// eslint-disable-line no-unused-vars
            tag = elemName;

+            if (tag == 'a' && inNote) {
+                growParagraph('</note>', 0);
+                inNote = false;
+            }
+
            if (tag == 'binary') {
                binaryId = '';
            }
        
            if (path.indexOf('/fictionbook/body') == 0) {
+                if (tag == 'body') {
+                    inNotesBody = false;
+                }
+
                if (tag == 'title') {
                    isFirstTitlePara = false;
                    bold = false;
@@ -462,6 +526,10 @@ export default class BookParser {

                if (tag == 'p') {
                    inPara = false;
+
+                    if (inTitle && inNotesBody && noteId) {
+                        growParagraph('</note>', 0);
+                    }
                }

                if (tag == 'subtitle') {
@@ -485,6 +553,10 @@ export default class BookParser {
                    bold = false;
                    space -= 1;
                }
+
+                if (!inTitle && inNotesBody && noteId && noteTags.has(tag)) {
+                    this.notes[noteId].xml += `</${tag}>`;
+                }
            }

            let i = path.lastIndexOf(tag);
@@ -570,6 +642,14 @@ export default class BookParser {
                    growParagraph(`${tOpen}${text}${tClose}`, text.length, text);
                else
                    growParagraph(' ', 1);
+
+                if (inNotesBody && noteId) {
+                    if (inTitle) {
+                        this.notes[noteId].title += text;
+                    } else {
+                        this.notes[noteId].xml += text;
+                    }
+                }
            }
        };

@@ -602,7 +682,7 @@ export default class BookParser {
        return {fb2};
    }

-    imageHrefToId(id) {
+    hrefToId(id) {
        let local = false;
        if (id[0] == '#') {
            id = id.substr(1);
@@ -635,7 +715,7 @@ export default class BookParser {

    splitToStyle(s) {
        let result = [];/*array of {
-            style: {bold: Boolean, italic: Boolean, sup: Boolean, sub: Boolean, center: Boolean, space: Number},
+            style: {bold: Boolean, italic: Boolean, sup: Boolean, sub: Boolean, center: Boolean, space: Number, note: Object},
            image: {local: Boolean, inline: Boolean, id: String},
            text: String,
        }*/
@@ -686,7 +766,7 @@ export default class BookParser {
                case 'image': {
                    let attrs = sax.getAttrsSync(tail);
                    if (attrs.href && attrs.href.value) {
-                        image = this.imageHrefToId(attrs.href.value);
+                        image = this.hrefToId(attrs.href.value);
                        image.inline = false;
                        image.num = (attrs.num && attrs.num.value ? attrs.num.value : 0);
                    }
@@ -695,7 +775,7 @@ export default class BookParser {
                case 'image-inline': {
                    let attrs = sax.getAttrsSync(tail);
                    if (attrs.href && attrs.href.value) {
-                        const img = this.imageHrefToId(attrs.href.value);
+                        const img = this.hrefToId(attrs.href.value);
                        img.inline = true;
                        img.num = (attrs.num && attrs.num.value ? attrs.num.value : 0);
                        result.push({
@@ -706,6 +786,13 @@ export default class BookParser {
                    }
                    break;
                }
+                case 'note': {
+                    let attrs = sax.getAttrsSync(tail);
+                    if (attrs.href && attrs.href.value) {
+                        style.note = {id: attrs.href.value, orig: attrs.orig?.value};
+                    }
+                    break;
+                }
            }
        };

@@ -734,6 +821,9 @@ export default class BookParser {
                    break;
                case 'image-inline':
                    break;
+                case 'note':
+                    style.note = false;
+                    break;
            }
        };

--- a/client/components/Reader/share/bookManager.js
+++ b/client/components/Reader/share/bookManager.js
@@ -467,7 +467,7 @@ class BookManager {
    async getRecentBook(value) {
        return this.recent[value.key];
    }
-
+/*
    async delRecentBook(value, delFlag = 1) {
        const item = this.recent[value.key];
        item.deleted = delFlag;
@@ -479,13 +479,37 @@ class BookManager {
        await this.recentSetItem(item);
        this.emit('recent-deleted', value.key);
    }
+*/
+    async delRecentBooks(values, delFlag = 1) {
+        for (const value of values) {
+            const item = this.recent[value.key];
+            item.deleted = delFlag;

+            if (this.recentLastKey == value.key) {
+                await this.recentSetLastKey(null);
+            }
+
+            await this.recentSetItem(item);
+        }
+        
+        this.emit('recent-deleted');
+    }
+/*
    async restoreRecentBook(value) {
        const item = this.recent[value.key];
        item.deleted = 0;

        await this.recentSetItem(item);
    }
+*/
+    async restoreRecentBooks(values) {
+        for (const value of values) {
+            const item = this.recent[value.key];
+            item.deleted = 0;
+
+            await this.recentSetItem(item);
+        }
+    }

    async setCheckBuc(value, checkBuc) {
        const item = this.recent[value.key];
--- a/client/components/Reader/versionHistory.js
+++ b/client/components/Reader/versionHistory.js
@@ -1,4 +1,45 @@
 export const versionHistory = [
+{
+    version: '1.2.3',
+    releaseDate: '2024-08-02',
+    showUntil: '2024-08-01',
+    content:
+`
+<ul>
+    <li>исправление багов</li>
+</ul>
+
+`
+},
+
+{
+    version: '1.2.2',
+    releaseDate: '2024-07-28',
+    showUntil: '2024-07-27',
+    content:
+`
+<ul>
+    <li>добавлено отображение примечаний на месте, по клику на сноске (#50)</li>
+    <li>исправление багов</li>
+</ul>
+
+`
+},
+
+{
+    version: '1.2.0',
+    releaseDate: '2024-03-25',
+    showUntil: '2024-03-24',
+    content:
+`
+<ul>
+    <li>в списке загруженных, книга в архив (из архива) переносится теперь со всей группой своих версий</li>
+    <li>добавлена возможность задавать в конфиге любую ссылку для кнопки "Сетевая библиотека", параметр networkLibraryLink (#47)</li>
+</ul>
+
+`
+},
+
 {
    version: '1.1.3',
    releaseDate: '2023-02-06',
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "liberama",
-  "version": "1.1.3",
+  "version": "1.2.3",
  "author": "Book Pauk <bookpauk@gmail.com>",
  "license": "CC0-1.0",
  "repository": "bookpauk/liberama",
@@ -25,41 +25,41 @@
    "scripts": "server/config/*.js"
  },
  "devDependencies": {
-    "@babel/core": "^7.20.5",
-    "@babel/eslint-parser": "^7.19.1",
-    "@babel/eslint-plugin": "^7.19.1",
-    "@babel/plugin-proposal-decorators": "^7.20.5",
-    "@babel/preset-env": "^7.20.2",
+    "@babel/core": "^7.23.5",
+    "@babel/eslint-parser": "^7.23.3",
+    "@babel/eslint-plugin": "^7.23.5",
+    "@babel/plugin-proposal-decorators": "^7.23.5",
+    "@babel/preset-env": "^7.23.5",
    "@vue/compiler-sfc": "^3.2.22",
-    "babel-loader": "^9.1.0",
+    "babel-loader": "^9.1.3",
    "copy-webpack-plugin": "^11.0.0",
-    "css-loader": "^6.7.3",
+    "css-loader": "^6.8.1",
    "css-minimizer-webpack-plugin": "^4.2.2",
-    "eslint": "^8.29.0",
-    "eslint-plugin-vue": "^9.8.0",
-    "html-webpack-plugin": "^5.5.0",
-    "mini-css-extract-plugin": "^2.7.2",
-    "pkg": "^5.8.0",
+    "eslint": "^8.55.0",
+    "eslint-plugin-vue": "^9.19.2",
+    "html-webpack-plugin": "^5.5.4",
+    "mini-css-extract-plugin": "^2.7.6",
+    "pkg": "^5.8.1",
    "showdown": "^2.1.0",
-    "terser-webpack-plugin": "^5.3.6",
-    "vue-eslint-parser": "^9.1.0",
-    "vue-loader": "^17.0.1",
+    "terser-webpack-plugin": "^5.3.9",
+    "vue-eslint-parser": "^9.3.2",
+    "vue-loader": "^17.3.1",
    "vue-style-loader": "^4.1.3",
-    "webpack": "^5.75.0",
-    "webpack-cli": "^5.0.1",
-    "webpack-dev-middleware": "^6.0.1",
-    "webpack-hot-middleware": "^2.25.3",
-    "webpack-merge": "^5.8.0",
-    "workbox-webpack-plugin": "^6.5.4"
+    "webpack": "^5.89.0",
+    "webpack-cli": "^5.1.4",
+    "webpack-dev-middleware": "^6.1.1",
+    "webpack-hot-middleware": "^2.25.4",
+    "webpack-merge": "^5.10.0",
+    "workbox-webpack-plugin": "^6.6.0"
  },
  "dependencies": {
-    "@quasar/extras": "^1.15.8",
-    "@vue/compat": "^3.2.45",
+    "@quasar/extras": "^1.16.9",
+    "@vue/compat": "^3.3.10",
    "axios": "^0.27.2",
    "base-x": "^4.0.0",
-    "chardet": "^1.5.0",
+    "chardet": "^1.6.0",
    "compression": "^1.7.4",
-    "dayjs": "^1.11.7",
+    "dayjs": "^1.11.10",
    "express": "^4.18.2",
    "fg-loadcss": "^3.1.0",
    "fs-extra": "^10.1.0",
@@ -68,23 +68,23 @@
    "jembadb": "^5.1.7",
    "localforage": "^1.10.0",
    "lodash": "^4.17.21",
-    "minimist": "^1.2.7",
+    "minimist": "^1.2.8",
    "multer": "^1.4.5-lts.1",
    "pako": "^2.1.0",
    "path-browserify": "^1.0.1",
    "pidusage": "^3.0.2",
-    "quasar": "^2.10.2",
+    "quasar": "^2.14.1",
    "safe-buffer": "^5.2.1",
-    "sanitize-html": "^2.8.0",
+    "sanitize-html": "^2.11.0",
    "sjcl": "^1.0.8",
    "tar-fs": "^2.1.1",
    "unbzip2-stream": "^1.4.3",
    "vue": "^3.2.37",
-    "vue-router": "^4.1.6",
+    "vue-router": "^4.2.5",
    "vuex": "^4.1.0",
    "vuex-persist": "^3.1.3",
-    "webdav": "^4.11.2",
-    "ws": "^8.11.0",
-    "zip-stream": "^4.1.0"
+    "webdav": "^4.11.3",
+    "ws": "^8.14.2",
+    "zip-stream": "^4.1.1"
  }
 }
--- a/server/config/base.js
+++ b/server/config/base.js
@@ -18,7 +18,7 @@ module.exports = {

    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', 'acceptFileExt', 'bucEnabled', 'branch'],
+    webConfigParams: ['name', 'version', 'mode', 'maxUploadFileSize', 'useExternalBookConverter', 'acceptFileExt', 'bucEnabled', 'branch', 'networkLibraryLink'],

    jembaDb: [
        {
@@ -56,6 +56,9 @@ module.exports = {
            ip: '0.0.0.0',
            port: '33443',
            accessToken: '',
+            shciForHost: {
+                'samlib.ru': 300000
+            },
        }*/
    ],

@@ -74,5 +77,6 @@ module.exports = {
        accessToken: '',
    }
    */
+    networkLibraryLink: '',
 };

--- a/server/config/index.js
+++ b/server/config/index.js
@@ -14,6 +14,7 @@ const propsToSave = [
    'remoteStorage',
    'bucEnabled',
    'bucServer',
+    'networkLibraryLink',
 ];

 let instance = null;
--- a/server/core/BookUpdateChecker/BUCServer.js
+++ b/server/core/BookUpdateChecker/BUCServer.js
@@ -27,8 +27,8 @@ class BUCServer {

                this.cleanQueryInterval = 300*dayMs;//интервал очистки устаревших
                this.oldQueryInterval = 14*dayMs;//интервал устаревания запроса на обновление
-                this.checkingInterval = 5*hourMs;//интервал проверки обновления одного и того же файла
-                this.sameHostCheckInterval = 1000;//интервал проверки файла на том же сайте, не менее
+                this.checkingInterval = 1*dayMs;//интервал проверки обновления одного и того же файла
+                this.sameHostCheckInterval = 10*1000;//интервал проверки файла на том же сайте, не менее
            } else {
                this.maxCheckQueueLength = 10;//максимальная длина checkQueue
                this.fillCheckQueuePeriod = 10*1000;//период пополнения очереди
@@ -51,6 +51,7 @@ class BUCServer {
            
            this.checkQueue = [];
            this.hostChecking = {};
+            this.shciForHost = this.config.shciForHost || {};//sameHostCheckInterval for host

            this.main(); //no await

@@ -262,7 +263,7 @@ class BUCServer {
                        let unchanged = true;
                        let hash = '';

-                        const headers = await this.down.head(row.id);
+                        const headers = await this.down.head(row.id, {timeout: 10*1000});

                        const etag = headers['etag'] || '';
                        const modTime = headers['last-modified'] || '';
@@ -276,7 +277,7 @@ class BUCServer {
                            && (!size || !row.size || (size !== row.size))
                            ) {

-                            const downdata = await this.down.load(row.id);
+                            const downdata = await this.down.load(row.id, {timeout: 10*1000});

                            size = downdata.length;
                            hash = await utils.getBufHash(downdata, 'sha256', 'hex');
@@ -316,7 +317,12 @@ class BUCServer {
                        log(LM_ERR, `error ${row.id} > ${e.stack ? e.stack : e.message}`);
                    } finally {
                        (async() => {
-                            await utils.sleep(this.sameHostCheckInterval);
+                            let sameHostCheckInterval = this.shciForHost[url.hostname] || this.sameHostCheckInterval;
+                            sameHostCheckInterval = Math.round((Math.random() - 0.5)*(sameHostCheckInterval*0.2) + sameHostCheckInterval);
+
+                            log(`delay ${sameHostCheckInterval}ms for host '${url.hostname}'`);
+                            await utils.sleep(sameHostCheckInterval);
+
                            this.hostChecking[url.hostname] = false;
                        })();
                    }
@@ -327,7 +333,7 @@ class BUCServer {
                log(LM_ERR, e.stack);
            }

-            await utils.sleep(10);
+            await utils.sleep(100);
        }
    }

--- a/server/core/FileDownloader.js
+++ b/server/core/FileDownloader.js
@@ -2,7 +2,7 @@ const https = require('https');
 const axios = require('axios');
 const utils = require('./utils');

-const userAgent = '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';
+const userAgent = 'Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/113.0';

 class FileDownloader {
    constructor(limitDownloadSize = 0) {
@@ -16,7 +16,6 @@ class FileDownloader {
            headers: {
                'accept-encoding': 'gzip, compress, deflate',
                'user-agent': userAgent,
-                timeout: 300*1000,
            },
            httpsAgent: new https.Agent({
                rejectUnauthorized: false // решение проблемы 'unable to verify the first certificate' для некоторых сайтов с валидным сертификатом
@@ -26,6 +25,9 @@ class FileDownloader {
        if (opts)
            options = Object.assign({}, opts, options);

+        if (!options.timeout)
+            options.timeout = 300*1000;//5 min
+
        try {
            const res = await axios.get(url, options);

@@ -77,8 +79,8 @@ class FileDownloader {
        const options = {
            headers: {
                'user-agent': userAgent,
-                timeout: 10*1000,
            },
+            timeout: 10*1000,
        };

        const res = await axios.head(url, options);
--- a/server/index.js
+++ b/server/index.js
@@ -1,4 +1,5 @@
 require('tls').DEFAULT_MIN_VERSION = 'TLSv1';
+process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';

 const fs = require('fs-extra');
 const express = require('express');
Author	SHA1	Message	Date
Book Pauk	fc8e986acb	Merge branch 'release/1.2.3'	2024-08-02 15:22:24 +07:00
Book Pauk	64539785c2	1.2.3	2024-08-02 15:22:07 +07:00
Book Pauk	f530455146	Версия 1.2.3	2024-08-02 15:21:43 +07:00
Book Pauk	70dc66e1ae	Исправление мелких багов при прокрутке	2024-08-02 15:15:54 +07:00
Book Pauk	3e5894d9e0	Исправление багов	2024-07-31 11:44:07 +07:00
Book Pauk	d7ac9d1bfc	Улучшение отображения примечаний	2024-07-31 11:30:31 +07:00
Book Pauk	5160c5fb75	Мелкая поправка текста	2024-07-30 21:29:02 +07:00
Book Pauk	d9c7964410	Поправки багов	2024-07-30 21:28:27 +07:00
Book Pauk	110952b4c4	К предыдущему	2024-07-30 18:41:21 +07:00
Book Pauk	ece17dc0dd	Улучшение отображения сносок	2024-07-30 18:23:52 +07:00
Book Pauk	35e1087531	Merge tag '1.2.2' into develop 1.2.2	2024-07-28 20:22:59 +07:00
Book Pauk	59c4b62770	Merge branch 'release/1.2.2'	2024-07-28 20:22:54 +07:00
Book Pauk	4be9ce5ff3	Версия 1.2.2	2024-07-28 20:22:33 +07:00
Book Pauk	92a811cabd	Поправки парсинга примечаний	2024-07-28 20:20:45 +07:00
Book Pauk	897cdc8ac7	Исправление парсинга примечаний	2024-07-28 20:13:35 +07:00
Book Pauk	418ff482ae	Merge tag '1.2.1' into develop 1.2.1	2024-07-28 17:55:11 +07:00
Book Pauk	8858d6d1f2	Merge branch 'release/1.2.1'	2024-07-28 17:55:05 +07:00
Book Pauk	41f8a28631	Версия 1.2.1	2024-07-28 17:52:16 +07:00
Book Pauk	da0771d5e5	Мелкая поправка разметки	2024-07-28 17:47:15 +07:00
Book Pauk	c03995367a	Поправки багов	2024-07-28 17:45:18 +07:00
Book Pauk	0430105061	Добавлено отображение примечаний на месте, по клику на примечании (#50 )	2024-07-28 17:23:16 +07:00
Book Pauk	afd4d02dad	Улучшение BUCServer	2024-07-26 17:19:45 +07:00
Book Pauk	d634ebf14c	Улучшение BUCServer	2024-07-26 15:54:41 +07:00
Book Pauk	613230256a	Небольшой тюнинг BUCServer	2024-07-26 00:49:39 +07:00
Book Pauk	2da1736c99	Поправка для игнорирования невалидных сертификатов	2024-07-25 18:10:13 +07:00
Book Pauk	1914092520	npx update-browserslist-db@latest	2024-07-25 16:51:44 +07:00
Book Pauk	4a6f93a14f	edit	2024-03-25 13:02:13 +07:00
Book Pauk	9da8142078	Merge tag '1.2.0' into develop 1.2.0	2024-03-25 12:54:14 +07:00
Book Pauk	cafdb5b04b	Merge branch 'release/1.2.0'	2024-03-25 12:54:05 +07:00
Book Pauk	697774978e	Добавлена возможность задавать в конфиге любую ссылку для кнопки "Сетевая библиотека", параметр networkLibraryLink (#47 )	2024-03-25 12:52:46 +07:00
Book Pauk	8c2c2fe2fc	1.2.0	2023-12-07 16:31:13 +07:00
Book Pauk	e3770463a1	В списке загруженных, книга в архив (из архива) переносится теперь со всей группой своих версий	2023-12-07 16:26:30 +07:00
Book Pauk	d3ad23e9e4	Актуализация пакетов	2023-12-07 15:01:26 +07:00
Book Pauk	79d1e0b30d	Merge tag '1.1.3' into develop 1.1.3	2023-02-06 19:48:02 +07:00