Merge branch 'release/1.2.7'

1.2.6

client/api/misc.js

@@ -1,12 +1,15 @@
 import wsc from './webSocketConnection';
 
 class Misc {
-    async loadConfig() {
+    async loadConfig(_configHash) {
 
-        const query = {params: [
+        const query = {
-            'name', 'version', 'mode', 'maxUploadFileSize', 'useExternalBookConverter',
+            params: [
-            'acceptFileExt', 'bucEnabled', 'branch', 'networkLibraryLink', 'restricted'
+                'name', 'version', 'mode', 'maxUploadFileSize', 'useExternalBookConverter',
-        ]};
+                'acceptFileExt', 'bucEnabled', 'branch', 'networkLibraryLink', 'restricted'
+            ],
+            _configHash,
+        };
 
         const config = await wsc.message(await wsc.send(Object.assign({action: 'get-config'}, query)));
         if (config.error)

client/components/App.vue

@@ -154,8 +154,11 @@ class App {
         (async() => {
             //загрузим конфиг сервера
             try {
-                const config = await miscApi.loadConfig();
+                const config = await miscApi.loadConfig(this.config._configHash);
-                this.commit('config/setConfig', config);
+
+                if (!config._useCached)
+                    this.commit('config/setConfig', config);
+
                 this.showPage = true;
             } catch(e) {
                 //проверим, не получен ли конфиг ранее

client/components/Reader/HelpPage/HelpPage.vue

@@ -51,7 +51,7 @@ const tabs = [
     ['MouseHelpPage', 'Мышь/тачскрин'],
     ['HotkeysHelpPage', 'Клавиатура'],
     ['VersionHistoryPage', 'История версий'],
-    ['DonateHelpPage', 'Помочь проекту'],
+    //['DonateHelpPage', 'Помочь проекту'],
 ];
 
 const componentOptions = {

client/components/Reader/Reader.vue

@@ -416,7 +416,7 @@ class Reader {
             await wallpaperStorage.init();
             await coversStorage.init();
             
-            await bookManager.init(this.settings, this.restricted);
+            await bookManager.init(this.settings);
             bookManager.addEventListener(this.bookManagerEvent);
 
             if (this.$root.getRootRoute() == '/reader') {
@@ -1267,6 +1267,19 @@ class Reader {
         return result;
     }
 
+    isUrlAllowed(url) {
+        const restrictedSites = this.restricted?.sites;
+        if (restrictedSites) {
+            url = url.toLowerCase();
+            for (const site of restrictedSites) {
+                if (url.indexOf(site) === 0)
+                    return false;
+            }
+        }
+
+        return true;
+    }
+
     async _loadBook(opts) {
         if (!opts || !opts.url) {
             this.mostRecentBook();
@@ -1277,6 +1290,11 @@ class Reader {
 
         let url = encodeURI(decodeURI(opts.url));
 
+        if (!this.isUrlAllowed(url)) {
+            this.$root.stdDialog.alert('Книга не загружена, причина: нарушение авторских прав.<br>Приносим извинения за неудобство.', '', {color: 'negative'});
+            return;
+        }
+
         if ((url.indexOf('http://') != 0) && (url.indexOf('https://') != 0) &&
             (url.indexOf('disk://') != 0))
             url = 'http://' + url;

client/components/Reader/ReaderDialogs/ReaderDialogs.vue

@@ -131,7 +131,7 @@ class ReaderDialogs {
 
     async init() {
         await this.showWhatsNew();
-        await this.showDonation();
+        //await this.showDonation();
     }
 
     loadSettings() {

client/components/Reader/SettingsPage/OthersTab/OthersTab.vue

@@ -53,7 +53,7 @@
             </q-checkbox>
         </div>
 
-        <div class="sets-item row">
+        <!--div class="sets-item row">
             <div class="sets-label label">
                 Уведомление
             </div>
@@ -63,7 +63,7 @@
                     Показывать диалог для сбора пожертвований
                 </q-tooltip>
             </q-checkbox>
-        </div>
+        </div-->
 
         <!---------------------------------------------->
         <div class="sets-part-header">

client/components/Reader/share/bmHelper.js

@@ -1,8 +0,0 @@
-export default {
-    restrictedData: `<?xml version="1.0" encoding="utf-8"?>
-<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink">
-<description><title-info><book-title>Нарушение авторских прав</book-title></title-info></description>
-<body><section><p>Книга не загружена по причине нарушения авторских прав.</p></section></body>
-</FictionBook>`,
-
-};

client/components/Reader/share/bookManager.js

@@ -3,7 +3,6 @@ import path from 'path-browserify';
 import _ from 'lodash';
 
 import BookParser from './BookParser';
-import bmHelper from './bmHelper';
 import readerApi from '../../../api/reader';
 import coversStorage from './coversStorage';
 import * as utils from '../../../share/utils';
@@ -27,10 +26,9 @@ const bmRecentStoreNew = localForage.createInstance({
 });
 
 class BookManager {
-    async init(settings, restricted) {
+    async init(settings) {
         this.loaded = false;
         this.settings = settings;
-        this.restricted = restricted;
 
         this.eventListeners = [];
         this.books = {};
@@ -234,18 +232,6 @@ class BookManager {
         return inflator.result;
     }
 
-    isUrlAllowed(url) {
-        const restrictedSites = this.restricted?.sites;
-        if (restrictedSites) {
-            for (const site of restrictedSites) {
-                if (url.indexOf(site) === 0)
-                    return false;
-            }
-        }
-
-        return true;
-    }
-
     async addBook(newBook, callback) {        
         let meta = {url: newBook.url, path: newBook.path};
 
@@ -362,10 +348,6 @@ class BookManager {
     }
 
     async parseBook(meta, data, callback) {
-        if (!this.isUrlAllowed(meta.url)) {
-            data = bmHelper.restrictedData;
-        }
-
         const parsed = new BookParser(this.settings);
 
         const parsedMeta = await parsed.parse(data, callback);

client/components/Reader/versionHistory.js

@@ -1,6 +1,20 @@
 export const versionHistory = [
 {
-    version: '1.2.5',
+    version: '1.2.7',
+    releaseDate: '2025-02-22',
+    showUntil: '2025-02-21',
+    content:
+`
+<ul>
+    <li>отключена форма для сбора донатов</li>
+    <li>мелкие оптимизации</li>
+</ul>
+
+`
+},
+
+{
+    version: '1.2.6',
     releaseDate: '2024-10-03',
     showUntil: '2024-10-02',
     content:

client/store/modules/config.js

@@ -1,4 +1,3 @@
-import miscApi from '../../api/misc';
 // initial state
 const state = {
     name: null,

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "liberama",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "liberama",
-      "version": "1.2.5",
+      "version": "1.2.6",
       "hasInstallScript": true,
       "license": "CC0-1.0",
       "dependencies": {
@@ -3364,9 +3364,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001643",
+      "version": "1.0.30001700",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001700.tgz",
-      "integrity": "sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg==",
+      "integrity": "sha512-2S6XIXwaE7K7erT8dY+kLQcpa5ms63XlRkMkReXjle+kf6c5g38vyMl+Z5y8dSxOFDhcFe+nxnn261PLxBSQsQ==",
       "dev": true,
       "funding": [
         {
@@ -13709,9 +13709,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001643",
+      "version": "1.0.30001700",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001700.tgz",
-      "integrity": "sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg==",
+      "integrity": "sha512-2S6XIXwaE7K7erT8dY+kLQcpa5ms63XlRkMkReXjle+kf6c5g38vyMl+Z5y8dSxOFDhcFe+nxnn261PLxBSQsQ==",
       "dev": true
     },
     "chalk": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "liberama",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "author": "Book Pauk <bookpauk@gmail.com>",
   "license": "CC0-1.0",
   "repository": "bookpauk/liberama",

server/controllers/WebSocketController.js

@@ -20,6 +20,8 @@ class WebSocketController {
         this.readerWorker = new ReaderWorker(config);
         this.workerState = new WorkerState();
 
+        this.configHash = '';
+
         if (config.bucEnabled) {
             this.bucClient = new BUCClient(config);
         }
@@ -119,8 +121,22 @@ class WebSocketController {
     async getConfig(req, ws) {
         if (Array.isArray(req.params)) {
             const paramsSet = new Set(req.params);
+            const _configHash = req._configHash;
 
-            this.send(_.pick(this.config, this.config.webConfigParams.filter(x => paramsSet.has(x))), req, ws);
+            let response = {_useCached: true};
+
+            //оптимизация, чтобы не отдавал большой конфиг каждый раз при обновлении страницы
+            if (!_configHash || _configHash !== this.configHash) {
+                if (!this.configHash) {
+                    const webConfig = _.pick(this.config, this.config.webConfigParams);
+                    this.configHash = await utils.getBufHash(Buffer.from(JSON.stringify(webConfig)), 'sha256', 'hex');
+                }
+
+                response = _.pick(this.config, this.config.webConfigParams.filter(x => paramsSet.has(x)));
+                response._configHash = this.configHash;
+            }
+
+            this.send(response, req, ws);
         } else {
             throw new Error('params is not an array');
         }