Merge branch 'release/1.5.4'

1.5.3

.gitignore

@@ -1,5 +1,4 @@
 /node_modules
 /server/.inpx-web*
-/server/inpx-web-filter.json
 /dist
 dev*.sh

CHANGELOG.md

@@ -0,0 +1,92 @@
+1.5.4 / 2023-04-12
+
+- Добавлена возможность поиска по типу файла
+- Улучшена работа с inpx, теперь понимает файлы в каталогах (без zip-архива)
+- В readme добавлен раздел "Запуск без сборки релиза" для запуска inpx-web на любых платформах
+- Исправления мелких багов
+
+1.5.3 / 2023-03-02
+
+- OPDS: исправление проблемы поиска для koreader
+- OPDS: улучшено скачивание для не-fb2 форматов файлов (djvu, pdf и пр.)
+- Добавлена полоска уведомления о выходе новой версии (отключается в настройках веб-интерфейса).
+  Проверка новой версии настраивается параметром checkReleaseLink в конфиге сервера (#15)
+
+1.5.2 / 2023-02-05
+
+- Исправление проблемы чтения каталога opds для koreader
+
+1.5.1 / 2023-01-28
+------------------
+
+- Настройки веб-интерфейса и опции командной строки "--lib-dir", "--inpx" вынесены в конфиг (#6)
+- Уменьшена длина имени файла при скачивании (#7)
+- OPDS: добавлен раздел "Жанры", в поиск добавлен раздел "Поиск книг в жанре" (#9)
+- Исправление проблем скроллинга панели инструментов (#12)
+- Улучшено отображение веб-интерфейса на мобильных устройствах
+
+1.4.1 / 2022-12-21
+------------------
+
+- Добавлена возможность поиска по регулярному выражению (префикс "~")
+- Заплатка для исправления (#10)
+
+1.4.0 / 2022-12-07
+------------------
+
+- Добавлена возможность расширенного поиска (раздел "</>"). Поиск не оптимизирован и может сильно нагружать сервер.
+Отключить можно в конфиге, параметр extendedSearch
+- Улучшение поддержки reverse-proxy, в конфиг добавлены параметры server.root и opds.root для встраивания inpx-web в уже существующий веб-сервер
+- В настройки веб-интерфейса добавлена опция "Скачивать книги в виде zip-архива"
+- Исправлен баг "Android-читалки не очень хорошо работают с OPDS" (#4)
+- Добавлена сборка релизов для Linux arm64
+- В readme добавлена ссылка для донатов: [отблагодарить автора проекта](https://donatty.com/liberama)
+
+1.3.3 / 2022-11-28
+------------------
+
+- Исправление выявленных недочетов
+
+1.3.2 / 2022-11-27
+------------------
+
+- Изменения механизма ограничения доступа по паролю:
+  - появилась возможность выхода из сессии
+  - в конфиг добавлена настройка таймаута для автозавершения сессии
+- Добавлено отображение количества книг в серии в разделе "Авторы"
+
+1.3.1 / 2022-11-25
+------------------
+
+- Улучшена кроссплатформенность приложения
+
+1.3.0 / 2022-11-24
+------------------
+
+- Добавлен OPDS-сервер для inpx-коллекции
+- Произведена небольшая оптимизация поисковой БД
+- Добавлен релиз для macos, без тестирования
+
+1.2.4 / 2022-11-14
+------------------
+
+- Добавлена возможность посмотреть обложку в увеличении
+- Исправление выявленных недочетов
+
+1.2.3 / 2022-11-12
+------------------
+
+- Добавлено диалоговое окно "Информация о книге"
+- Небольшие изменения интерфейса, добавлена кнопка "Клонировать поиск"
+
+1.1.4 / 2022-11-03
+------------------
+
+- Исправлен баг "Не качает книги #1"
+
+1.1.2 / 2022-10-31
+------------------
+
+- Добавлены разделы "Серии" и "Книги"
+- Расширена форма поиска: добавлен поиск по датам поступления и оценкам
+

README.md

@@ -2,19 +2,26 @@ inpx-web
 ========
 
 Веб-сервер для поиска по .inpx-коллекции.
-Выглядит это так: https://lib.omnireader.ru
+
+Выглядит следующим образом: [https://lib.omnireader.ru](https://lib.omnireader.ru)
 
 .inpx - индексный файл для импорта\экспорта информации из базы данных сетевых библиотек
 в базу каталогизатора [MyHomeLib](https://alex80.github.io/mhl/)
 или [freeLib](http://sourceforge.net/projects/freelibdesign)
 или [LightLib](https://lightlib.azurewebsites.net)
 
-Просто поместите приложение `inpx-web` в папку с .inpx-файлом и файлами библиотеки (zip-архивами) и запустите.
-Сервер будет доступен по адресу http://127.0.0.1:12380
+[Установка](#usage): просто поместить приложение `inpx-web` в папку с .inpx-файлом и файлами библиотеки (zip-архивами) и запустить.
 
-После открытия веб-приложения в бразуере, для быстрого понимания того, как работает поиск, воспользуйтесь памяткой (кнопка со знаком вопроса).
+По умолчанию, веб-сервер будет доступен по адресу [http://127.0.0.1:12380](http://127.0.0.1:12380)
 
-##
+OPDS-сервер доступен по адресу [http://127.0.0.1:12380/opds](http://127.0.0.1:12380/opds)
+
+Для указания местоположения .inpx-файла или папки с файлами библиотеки, воспользуйтесь [параметрами командной строки](#cli).
+Дополнительные параметры сервера настраиваются в [конфигурационном файле](#config).
+
+[Отблагодарить автора проекта](https://donatty.com/liberama)
+
+## 
 * [Возможности программы](#capabilities)
 * [Использование](#usage)
     * [Параметры командной строки](#cli)
@@ -22,12 +29,14 @@ inpx-web
     * [Удаленная библиотека](#remotelib)
     * [Фильтр по авторам и книгам](#filter)
     * [Настройка https с помощью nginx](#https)
-* [Сборка проекта](#build)
+* [Сборка релизов](#build)
+* [Запуск без сборки релиза](#native_run)
 * [Разработка](#development)
 
 <a id="capabilities" />
 
 ## Возможности программы
+- веб-интерфейс и OPDS-сервер
 - поиск по автору, серии, названию и пр.
 - скачивание книги, копирование ссылки или открытие в читалке
 - возможность указать рабочий каталог при запуске, а также расположение .inpx и файлов библиотеки
@@ -36,7 +45,7 @@ inpx-web
 - фильтр авторов и книг при создании поисковой БД для создания своей коллекции "на лету"
 - подхват изменений .inpx-файла (периодическая проверка), автоматическое пересоздание поисковой БД
 - мощная оптимизация, хорошая скорость поиска
-- релизы под Linux и Windows
+- релизы под Linux, MacOS и Windows
 
 <a id="usage" />
 
@@ -45,7 +54,9 @@ inpx-web
 Там же, при первом запуске, будет создана рабочая директория `.inpx-web`, в которой хранится
 конфигурационный файл `config.json`, файлы базы данных, журналы и прочее.
 
-По умолчанию сервер будет доступен по адресу http://127.0.0.1:12380
+По умолчанию веб-интерфейс будет доступен по адресу [http://127.0.0.1:12380](http://127.0.0.1:12380)
+
+OPDS-сервер доступен по адресу [http://127.0.0.1:12380/opds](http://127.0.0.1:12380/opds)
 
 <a id="cli" />
 
@@ -70,9 +81,28 @@ Options:
 При первом запуске в рабочей директории будет создан конфигурационный файл `config.json`:
 ```js
 {
+    // директория библиотеки (с zip-архивами), аналог параметра командной строки --lib-dir
+    // пустая строка: использовать значение по умолчанию - директорию файла приложения
+    "libDir": "",
+
+    // путь к файлу .inpx, аналог параметра командной строки --inpx
+    // пустая строка: использовать значение по умолчанию - inpx-файл, что найдется в директории библиотеки
+    "inpx": "",
+
     // пароль для ограничения доступа к веб-интерфейсу сервера
+    // пустое значение - доступ без ограничений
     "accessPassword": "",
 
+    // таймаут автозавершения сессии доступа к веб-интерфейсу (если задан accessPassword),
+    // при неактивности в течение указанного времени (в минутах), пароль будет запрошен заново
+    // 0 - отключить таймаут, время доступа по паролю не ограничено
+    "accessTimeout": 0,
+
+    // включить(true)/выключить(false) возможность расширенного поиска (раздел "</>")
+    // расширенный поиск не оптимизирован, поэтому может сильно нагружать сервер
+    // чтобы ускорить поиск, увеличьте параметр dbCacheSize
+    "extendedSearch": true,
+
     // содержимое кнопки-ссылки "(читать)", если не задано - кнопка "(читать)" не показывается
     // пример: "https://omnireader.ru/#/reader?url=${DOWNLOAD_LINK}"
     // на место ${DOWNLOAD_LINK} будет подставлена ссылка на скачивание файла книги
@@ -85,13 +115,21 @@ Options:
     // если надо кешировать всю БД, можно поставить значение от 1000 и больше
     "dbCacheSize": 5,
 
-    // максимальный размер в байтах директории закешированных файлов в <раб.дир>/public/files
+    // максимальный размер в байтах директории закешированных файлов в <раб.дир>/public-files
     // чистка каждый час
     "maxFilesDirSize": 1073741824,
     
-    // включить(true)/выключить(false) кеширование запросов на сервере
+    // включить(true)/выключить(false) серверное кеширование запросов на диске и в памяти
     "queryCacheEnabled": true,
 
+    // размер кеша запросов в оперативной памяти (количество)
+    // 0 - отключить кеширование запросов в оперативной памяти
+    "queryCacheMemSize": 50,
+
+    // размер кеша запросов на диске (количество)
+    // 0 - отключить кеширование запросов на диске
+    "queryCacheDiskSize": 500,
+
     // периодичность чистки кеша запросов на сервере, в минутах
     // 0 - отключить чистку
     "cacheCleanInterval": 60,
@@ -118,9 +156,48 @@ Options:
     "remoteLib": false,
 
     // настройки веб-сервера
+    // парамертр root указывает путь для кореневой страницы inpx-web
+    // например для "root": "/library", веб-интерфейс будет доступен по адресу http://127.0.0.1:12380/library
+    // root необходим при настройке reverse-proxy и встраивании inpx-web в уже существующий сервер
     "server": {
         "host": "0.0.0.0",
-        "port": "12380"
+        "port": "12380",
+        "root": ""
+    },
+
+    // настройки opds-сервера
+    // user, password используются для Basic HTTP authentication
+    // параметр root задает путь для доступа к opds-серверу
+    "opds": {
+        "enabled": true,
+        "user": "",
+        "password": "",
+        "root": "/opds"
+    },
+
+    // страница для скачивания свежего релиза
+    "latestReleaseLink": "https://github.com/bookpauk/inpx-web/releases/latest",
+
+    // api для проверки новой версии, 
+    // пустая строка - отключить проверку выхода новых версий
+    "checkReleaseLink": "https://api.github.com/repos/bookpauk/inpx-web/releases/latest",
+
+    // настройки по умолчанию для веб-интерфейса
+    // устанавливаются при первой загрузке страницы в браузере
+    // дальнейшие изменения настроек с помощью веб-интерфейса уже сохраняются в самом браузере
+    "uiDefaults": {
+        "limit": 20, // результатов на странице
+        "downloadAsZip": false, // скачивать книги в виде zip-архива
+        "showCounts": true, // показывать количество
+        "showRates": true, // показывать оценки
+        "showInfo": true, // показывать кнопку (инфо)
+        "showGenres": true, // показывать жанры
+        "showDates": false, // показывать даты поступления
+        "showDeleted": false, // показывать удаленные
+        "abCacheEnabled": true, // кешировать запросы
+        "langDefault": "", // язык по умолчанию (например "ru,en")
+        "showJson": false, // показывать JSON (в расширенном поиске)
+        "showNewReleaseAvailable": true // уведомлять о выходе новой версии
     }
 }
 ```
@@ -161,14 +238,13 @@ Options:
 
 ### Фильтр по авторам и книгам
 
-При создании поисковой БД во время загрузки и парсинга .inpx-файла, имеется возможность
+При создании поисковой БД, во время загрузки и парсинга .inpx-файла, имеется возможность
 отфильтровать авторов и книги, задав определенные критерии. Для этого небходимо создать
 в рабочей директории (там же, где `config.json`) файл `filter.json` следующего вида:
 ```json
 {
   "info": {
     "collection": "Новое название коллекции",
-    "structure": "",
     "version": "1.0.0"
   },
   "filter": "(r) => r.del == 0",
@@ -176,7 +252,7 @@ Options:
   "excludeAuthors": ["Имя автора"]
 }
 ```
-При создании поисковой БД, авторы и книги из `includeAuthors` будут добавлены, а из `excludeAuthors` исключены.
+При фильтрации, авторы и их книги из `includeAuthors` будут оставлены, а из `excludeAuthors` исключены.
 Использование совместно `includeAuthors` и `excludeAuthors` имеет мало смысла, поэтому для включения
 определенных авторов можно использовать только `includeAuthors`:
 ```json
@@ -246,27 +322,45 @@ sudo service nginx reload
 
 <a id="build" />
 
-### Сборка проекта
+### Сборка релизов
 Сборка только в среде Linux.
 Необходима версия node.js не ниже 16.
 
+Для сборки linux-arm64 необходимо предварительно установить [QEMU](https://wiki.debian.org/QemuUserEmulation).
+
 ```sh
 git clone https://github.com/bookpauk/inpx-web
 cd inpx-web
 npm i
+npm run release
 ```
 
-#### Для платформы Windows
+Результат сборки будет доступен в каталоге `dist/release`
+
+<a id="native_run" />
+
+### Запуск без сборки релиза
+Т.к. сборщик pkg поддерживает не все платформы, то не всегда удается собрать релиз.
+Однако, можно скачать и запустить inpx-web нативным путем, с помощью nodejs.
+Ниже пример для Ubuntu, для других линуксов различия не принципиальны:
+
 ```sh
-npm run build:win
-```
+# установка nodejs v16 и выше:
+curl -s https://deb.nodesource.com/setup_16.x | sudo bash
+sudo apt install nodejs -y
 
-#### Для платформы Linux
-```sh
-npm run build:linux
-```
+# подготовка
+git clone https://github.com/bookpauk/inpx-web
+cd inpx-web
+npm i
+npm run build:client && node build/prepkg.js linux
 
-Результат сборки будет доступен в каталоге `dist/linux|win` в виде исполнимого (standalone) файла.
+# удалим файл development-среды, чтобы запускался в production-режиме
+rm ./server/config/application_env
+
+# запуск inpx-web, тут же будет создан каталог .inpx-web
+node server --app-dir=.inpx-web
+```
 
 <a id="development" />
 

build/appdir.js

@@ -0,0 +1 @@
+module.exports = 'app0b58f8bd9fbfa95504ba';

build/prepkg.js

@@ -2,6 +2,8 @@ const fs = require('fs-extra');
 const path = require('path');
 const { execSync } = require('child_process');
 
+const showdown = require('showdown');
+
 const platform = process.argv[2];
 
 const distDir = path.resolve(__dirname, '../dist');
@@ -10,11 +12,17 @@ const publicDir = `${tmpDir}/public`;
 const outDir = `${distDir}/${platform}`;
 
 async function build() {
-    if (platform != 'linux' && platform != 'win')
-        throw new Error(`Unknown platform: ${platform}`);
+    if (!platform)
+        throw new Error(`Please set platform`);
 
     await fs.emptyDir(outDir);
 
+    //добавляем readme в релиз
+    let readme = await fs.readFile(path.resolve(__dirname, '../README.md'), 'utf-8');
+    const converter = new showdown.Converter();
+    readme = converter.makeHtml(readme);
+    await fs.writeFile(`${outDir}/readme.html`, readme);
+
     // перемещаем public на место
     if (await fs.pathExists(publicDir)) {
 

build/release.js

@@ -22,6 +22,8 @@ async function main() {
         await fs.emptyDir(outDir);
         await makeRelease('win');
         await makeRelease('linux');
+        await makeRelease('linux-arm64');
+        await makeRelease('macos');
     } catch(e) {
         console.error(e);
         process.exit(1);

build/webpack.base.config.js

@@ -2,6 +2,8 @@ const path = require('path');
 const DefinePlugin = require('webpack').DefinePlugin;
 const { VueLoaderPlugin } = require('vue-loader');
 
+const appdir = require('./appdir');
+
 const clientDir = path.resolve(__dirname, '../client');
 
 module.exports = {
@@ -12,7 +14,7 @@ module.exports = {
     },
     entry: [`${clientDir}/main.js`],
     output: {
-        publicPath: '/app/',
+        publicPath: `/${appdir}/`,
         clean: true
     },
 

build/webpack.dev.config.js

@@ -16,9 +16,8 @@ module.exports = merge(baseWpConfig, {
     mode: 'development',
     devtool: 'inline-source-map',
     output: {
-        path: `${publicDir}/app`,
+        path: `${publicDir}${baseWpConfig.output.publicPath}`,
         filename: 'bundle.js',
-        clean: true
     },
 
     module: {

build/webpack.prod.config.js

@@ -18,9 +18,8 @@ fs.emptyDirSync(publicDir);
 module.exports = merge(baseWpConfig, {
     mode: 'production',
     output: {
-        path: `${publicDir}/app`,
+        path: `${publicDir}${baseWpConfig.output.publicPath}`,
         filename: 'bundle.[contenthash].js',
-        clean: true
     },
     module: {
         rules: [

client/components/Api/Api.vue

@@ -60,10 +60,21 @@ const componentOptions = {
         settings() {
             this.loadSettings();
         },
+        modelValue(newValue) {
+            this.accessGranted = newValue;
+        },
+        accessGranted(newValue) {
+            this.$emit('update:modelValue', newValue);
+        }
     },
 };
 class Api {
     _options = componentOptions;
+    _props = {
+        modelValue: Boolean,
+    };
+    accessGranted = false;
+
     busyDialogVisible = false;
     mainMessage = '';
     jobMessage = '';
@@ -98,10 +109,6 @@ class Api {
         }
     }
 
-    get config() {
-        return this.$store.state.config;
-    }
-
     get settings() {
         return this.$store.state.settings;
     }
@@ -123,7 +130,13 @@ class Api {
             });
 
             if (result && result.value) {
-                const accessToken = utils.toHex(cryptoUtils.sha256(result.value));
+                //получим свежую соль
+                const response = await wsc.message(await wsc.send({}), 10);
+                let salt = '';
+                if (response && response.error == 'need_access_token' && response.salt)
+                    salt = response.salt;
+
+                const accessToken = utils.toHex(cryptoUtils.sha256(result.value + salt));
                 this.commit('setSettings', {accessToken});
             }
         } finally {
@@ -192,10 +205,13 @@ class Api {
                 const response = await wsc.message(await wsc.send(params), timeoutSecs);
 
                 if (response && response.error == 'need_access_token') {
+                    this.accessGranted = false;
                     await this.showPasswordDialog();
                 } else if (response && response.error == 'server_busy') {
+                    this.accessGranted = true;
                     await this.showBusyDialog();
                 } else {
+                    this.accessGranted = true;
                     if (response.error) {
                         throw new Error(response.error);
                     }
@@ -219,10 +235,18 @@ class Api {
         return await this.request({action: 'search', from, query}, 30);
     }
 
+    async bookSearch(query) {
+        return await this.request({action: 'bookSearch', query}, 30);
+    }
+
     async getAuthorBookList(authorId) {
         return await this.request({action: 'get-author-book-list', authorId});
     }
 
+    async getAuthorSeriesList(authorId) {
+        return await this.request({action: 'get-author-series-list', authorId});
+    }
+
     async getSeriesBookList(series) {
         return await this.request({action: 'get-series-book-list', series});
     }
@@ -231,13 +255,23 @@ class Api {
         return await this.request({action: 'get-genre-tree'});
     }    
 
-    async getBookLink(params) {
-        return await this.request(Object.assign({action: 'get-book-link'}, params), 120);
+    async getBookLink(bookUid) {
+        return await this.request({action: 'get-book-link', bookUid}, 120);
+    }
+
+    async getBookInfo(bookUid) {
+        return await this.request({action: 'get-book-info', bookUid}, 120);
     }
 
     async getConfig() {
         return await this.request({action: 'get-config'});
     }
+
+    async logout() {
+        await this.request({action: 'logout'});
+        this.accessGranted = false;
+        await this.request({action: 'test'});
+    }
 }
 
 export default vueComponent(Api);

client/components/Api/webSocketConnection.js

@@ -1,3 +1,7 @@
 import WebSocketConnection from '../../../server/core/WebSocketConnection';
 
-export default new WebSocketConnection();
+const protocol = (window.location.protocol == 'https:' ? 'wss:' : 'ws:');
+let url = `${protocol}//${window.location.host}${window.location.pathname}`;
+url += (url[url.length - 1] === '/' ? 'ws' : '/ws');
+
+export default new WebSocketConnection(url);

client/components/App.vue

@@ -1,10 +1,10 @@
 <template>
     <div class="fit row">
-        <Api ref="api" />
+        <Api ref="api" v-model="accessGranted" />
         <Notify ref="notify" />
         <StdDialog ref="stdDialog" />
 
-        <router-view v-slot="{ Component }">
+        <router-view v-if="accessGranted" v-slot="{ Component }">
             <keep-alive>
                 <component :is="Component" class="col" />
             </keep-alive>
@@ -37,6 +37,7 @@ const componentOptions = {
 };
 class App {
     _options = componentOptions;
+    accessGranted = false;
 
     created() {
         this.commit = this.$store.commit;
@@ -133,6 +134,15 @@ body, html, #app {
     animation: rotating 2s linear infinite;
 }
 
+.q-dialog__inner--minimized {
+    padding: 10px !important;
+}
+
+.q-dialog__inner--minimized > div {
+    max-height: 100% !important;
+    max-width: 800px !important;
+}
+
 @keyframes rotating { 
     from { 
         transform: rotate(0deg); 

client/components/Search/AuthorList/AuthorList.vue

@@ -25,7 +25,7 @@
 
                 <div class="q-ml-sm text-bold" style="color: #555">
                     {{ getBookCount(item) }}
-                </div>                    
+                </div>
             </div>
 
             <div v-if="item.bookLoading" class="book-row row items-center">
@@ -54,6 +54,10 @@
                             <div class="clickable2 q-ml-xs q-py-sm text-bold" @click="selectSeries(book.series)">
                                 Серия: {{ book.series }}
                             </div>
+
+                            <div class="q-ml-sm text-bold" style="color: #555">
+                                {{ getSeriesBookCount(item, book) }}
+                            </div>
                         </div>
 
                         <div v-if="isExpandedSeries(book) && book.seriesBooks">
@@ -122,9 +126,9 @@
         </div>
         <!-- Формирование списка конец ------------------------------------------------------------------>
 
-        <div v-if="!refreshing && !tableData.length" class="row items-center q-ml-md" style="font-size: 120%">
+        <div v-if="!refreshing && (!tableData.length || error)" class="row items-center q-ml-md" style="font-size: 120%">
             <q-icon class="la la-meh q-mr-xs" size="28px" />
-            Поиск не дал результатов
+            {{ (error ? error : 'Поиск не дал результатов') }}
         </div>
     </div>
 </template>
@@ -184,6 +188,26 @@ class AuthorList extends BaseList {
         return `(${result})`;
     }
 
+    getSeriesBookCount(item, book) {
+        let result = '';
+        if (!this.showCounts || book.type != 'series')
+            return result;
+
+        let count = book.seriesBooks.length;
+        result = `${count}`;
+        if (item.seriesLoaded) {
+            const rec = item.seriesLoaded[book.series];
+            // заплатка для исправления https://github.com/bookpauk/inpx-web/issues/10
+            // по невыясненным причинам rec иногда равен undefined
+            if (rec) {
+                const totalCount = (this.showDeleted ? rec.bookCount + rec.bookDelCount : rec.bookCount);
+                result += `/${totalCount}`;
+            }
+        }
+
+        return `(${result})`;
+    }
+
     async expandAuthor(item) {
         this.$emit('listEvent', {action: 'ignoreScroll'});
 
@@ -209,6 +233,19 @@ class AuthorList extends BaseList {
         }
     }
 
+    async getAuthorSeries(item) {
+        if (item.seriesLoaded)
+            return;
+
+        const series = await this.loadAuthorSeries(item.key);
+        const loaded = {};
+        for (const s of series) {
+            loaded[s.series] = {bookCount: s.bookCount, bookDelCount: s.bookDelCount};
+        }
+
+        item.seriesLoaded = loaded;
+    }
+
     async getAuthorBooks(item) {
         if (item.books) {
             if (item.count > this.maxItemCount) {
@@ -238,6 +275,13 @@ class AuthorList extends BaseList {
             const booksToFilter = await this.loadAuthorBooks(item.key);
             const filtered = this.filterBooks(booksToFilter);
 
+            if (!filtered.length && this.list.totalFound == 1) {
+                this.list.queryFound = 0;
+                this.list.totalFound = 0;
+                this.searchResult.found = [];
+                return false;
+            }
+
             const prepareBook = (book) => {
                 return Object.assign(
                     {
@@ -303,6 +347,7 @@ class AuthorList extends BaseList {
             }
 
             item.booksLoaded = books;
+            this.getAuthorSeries(item);//no await
             this.showMore(item);
 
             await this.$nextTick();
@@ -335,6 +380,7 @@ class AuthorList extends BaseList {
                 name: rec.author.replace(/,/g, ', '),
                 count,
                 booksLoaded: false,
+                seriesLoaded: false,
                 books: false,
                 bookLoading: false,
                 showMore: false,
@@ -345,7 +391,10 @@ class AuthorList extends BaseList {
                 if (authors.length > 1 || item.count > this.maxItemCount)
                     this.getAuthorBooks(item);//no await
                 else 
-                    await this.getAuthorBooks(item);
+                    if (await this.getAuthorBooks(item) === false) {
+                        this.tableData = [];
+                        return;
+                    }
             }
 
             result.push(item);
@@ -389,6 +438,7 @@ class AuthorList extends BaseList {
         if (this.refreshing)
             return;
 
+        this.error = '';
         this.refreshing = true;
 
         (async() => {
@@ -418,7 +468,12 @@ class AuthorList extends BaseList {
                         this.highlightPageScroller(query);
                     }
                 } catch (e) {
-                    this.$root.stdDialog.alert(e.message, 'Ошибка');
+                    this.list.queryFound = 0;
+                    this.list.totalFound = 0;
+                    this.searchResult = {found: []};
+                    await this.updateTableData();
+                    //this.$root.stdDialog.alert(e.message, 'Ошибка');
+                    this.error = `Ошибка: ${e.message}`;
                 }
             }
         } finally {

client/components/Search/BaseList.js

@@ -1,4 +1,5 @@
-import moment from 'moment';
+import axios from 'axios';
+import dayjs from 'dayjs';
 import _ from 'lodash';
 
 import authorBooksStorage from './authorBooksStorage';
@@ -20,13 +21,16 @@ const componentOptions = {
             this.loadSettings();
         },
         search: {
-            handler(newValue) {
-                this.limit = newValue.limit;
-
-                if (this.pageCount > 1)
-                    this.prevPage = this.search.page;
-
-                this.refresh();
+            handler() {
+                if (!this.isExtendedSearch)
+                    this.refresh();
+            },
+            deep: true,
+        },
+        extSearch: {
+            handler() {
+                if (this.isExtendedSearch)
+                    this.refresh();
             },
             deep: true,
         },
@@ -40,9 +44,11 @@ export default class BaseList {
     _props = {
         list: Object,
         search: Object,
+        extSearch: Object,
         genreMap: Object,
     };
     
+    error = '';
     loadingMessage = '';
     loadingMessage2 = '';
 
@@ -50,6 +56,7 @@ export default class BaseList {
     expandedAuthor = [];
     expandedSeries = [];
 
+    downloadAsZip = false;
     showCounts = true;
     showRates = true;
     showGenres = true;    
@@ -66,6 +73,7 @@ export default class BaseList {
     tableData = [];
 
     created() {
+        this.isExtendedSearch = false;
         this.commit = this.$store.commit;
         this.api = this.$root.api;
 
@@ -81,6 +89,7 @@ export default class BaseList {
 
         this.expandedAuthor = _.cloneDeep(settings.expandedAuthor);
         this.expandedSeries = _.cloneDeep(settings.expandedSeries);
+        this.downloadAsZip = settings.downloadAsZip;
         this.showCounts = settings.showCounts;
         this.showRates = settings.showRates;
         this.showGenres = settings.showGenres;
@@ -105,16 +114,19 @@ export default class BaseList {
     }
 
     selectAuthor(author) {
-        this.search.author = `=${author}`;
+        const search = (this.isExtendedSearch ? this.extSearch : this.search);
+        search.author = `=${author}`;
         this.scrollToTop();
     }
 
     selectSeries(series) {
-        this.search.series = `=${series}`;
+        const search = (this.isExtendedSearch ? this.extSearch : this.search);
+        search.series = `=${series}`;
     }
 
     selectTitle(title) {
-        this.search.title = `=${title}`;
+        const search = (this.isExtendedSearch ? this.extSearch : this.search);
+        search.title = `=${title}`;
     }
 
     async download(book, action) {
@@ -129,40 +141,24 @@ export default class BaseList {
         })();
 
         try {
-            const makeValidFilenameOrEmpty = (s) => {
-                try {
-                    return utils.makeValidFilename(s);
-                } catch(e) {
-                    return '';
-                }
-            };
-
-            //имя файла
-            let downFileName = 'default-name';
-            const author = book.author.split(',');
-            const at = [author[0], book.title];
-            downFileName = makeValidFilenameOrEmpty(at.filter(r => r).join(' - '))
-                || makeValidFilenameOrEmpty(at[0])
-                || makeValidFilenameOrEmpty(at[1])
-                || downFileName;
-            downFileName = downFileName.substring(0, 100);
-
-            const ext = `.${book.ext}`;
-            if (downFileName.substring(downFileName.length - ext.length) != ext)
-                downFileName += ext;
-
-            const bookPath = `${book.folder}/${book.file}${ext}`;
             //подготовка
-            const response = await this.api.getBookLink({bookPath, downFileName});
+            const response = await this.api.getBookLink(book._uid);
             
             const link = response.link;
-            const href = `${window.location.origin}${link}`;
+            let href = `${window.location.origin}${link}`;
 
+            //downloadAsZip
+            if (this.downloadAsZip && (action == 'download' || action == 'copyLink')) {
+                href += '/zip';
+                //подожлем формирования zip-файла
+                await axios.head(href);
+            }
+
+            //action
             if (action == 'download') {
                 //скачивание
                 const d = this.$refs.download;
                 d.href = href;
-                d.download = downFileName;
 
                 d.click();
             } else if (action == 'copyLink') {
@@ -185,6 +181,10 @@ export default class BaseList {
                     const url = this.config.bookReadLink.replace('${DOWNLOAD_LINK}', href);
                     window.open(url, '_blank');
                 }
+            } else if (action == 'bookInfo') {
+                //информация о книге
+                const response = await this.api.getBookInfo(book._uid);
+                this.$emit('listEvent', {action: 'bookInfo', data: response.bookInfo});
             }
         } catch(e) {
             this.$root.stdDialog.alert(e.message, 'Ошибка');
@@ -208,6 +208,7 @@ export default class BaseList {
             case 'download':
             case 'copyLink':
             case 'readBook':
+            case 'bookInfo':
                 this.download(event.book, event.action);//no await
                 break;
         }
@@ -271,7 +272,30 @@ export default class BaseList {
                 result = await this.api.getAuthorBookList(authorId);
             }
 
-            return (result.books ? JSON.parse(result.books) : []);
+            return result.books;
+        } catch (e) {
+            this.$root.stdDialog.alert(e.message, 'Ошибка');
+        }
+    }
+
+    async loadAuthorSeries(authorId) {
+        try {
+            let result;
+
+            if (this.abCacheEnabled) {
+                const key = `author-${authorId}-series-${this.list.inpxHash}`;
+                const data = await authorBooksStorage.getData(key);
+                if (data) {
+                    result = JSON.parse(data);
+                } else {
+                    result = await this.api.getAuthorSeriesList(authorId);
+                    await authorBooksStorage.setData(key, JSON.stringify(result));
+                }
+            } else {
+                result = await this.api.getAuthorSeriesList(authorId);
+            }
+
+            return result.series;
         } catch (e) {
             this.$root.stdDialog.alert(e.message, 'Ошибка');
         }
@@ -294,7 +318,7 @@ export default class BaseList {
                 result = await this.api.getSeriesBookList(series);
             }
 
-            return (result.books ? JSON.parse(result.books) : []);
+            return result.books;
         } catch (e) {
             this.$root.stdDialog.alert(e.message, 'Ошибка');
         }
@@ -348,7 +372,8 @@ export default class BaseList {
                 bookValue = emptyFieldValue;
 
             bookValue = bookValue.toLowerCase();
-            searchValue = searchValue.toLowerCase();
+            if (searchValue[0] !== '~')
+                searchValue = searchValue.toLowerCase();
 
             //особая обработка префиксов
             if (searchValue[0] == '=') {
@@ -362,7 +387,14 @@ export default class BaseList {
             } else if (searchValue[0] == '#') {
 
                 searchValue = searchValue.substring(1);
-                return !bookValue || (bookValue !== emptyFieldValue && !enru.has(bookValue[0]) && bookValue.indexOf(searchValue) >= 0);
+                if (!bookValue)
+                    return false;
+                return bookValue !== emptyFieldValue && !enru.has(bookValue[0]) && bookValue.indexOf(searchValue) >= 0;
+            } else if (searchValue[0] == '~') {//RegExp
+
+                searchValue = searchValue.substring(1);
+                const re = new RegExp(searchValue, 'i');
+                return re.test(bookValue);
             } else {
                 //where = `@dirtyIndexLR('value', ${db.esc(a)}, ${db.esc(a + maxUtf8Char)})`;
                 return bookValue.localeCompare(searchValue) >= 0 && bookValue.localeCompare(searchValue + maxUtf8Char) <= 0;
@@ -420,6 +452,13 @@ export default class BaseList {
                 librateFound = searchLibrate.has(book.librate);
             }
 
+            //ext
+            let extFound = !s.ext;
+            if (!extFound) {
+                const searchExt = new Set(s.ext.split('|'));
+                extFound = searchExt.has(book.ext.toLowerCase() || emptyFieldValue);
+            }
+
             return (this.showDeleted || !book.del)
                 && authorFound
                 && filterBySearch(book.series, s.series)
@@ -428,6 +467,7 @@ export default class BaseList {
                 && langFound
                 && dateFound
                 && librateFound
+                && extFound
             ;
         });
     }
@@ -485,13 +525,13 @@ export default class BaseList {
             */
             const sqlFormat = 'YYYY-MM-DD';
             switch (date) {
-                case 'today': date = utils.dateFormat(moment(), sqlFormat); break;
-                case '3days': date = utils.dateFormat(moment().subtract(3, 'days'), sqlFormat); break;
-                case 'week': date = utils.dateFormat(moment().subtract(1, 'weeks'), sqlFormat); break;
-                case '2weeks': date = utils.dateFormat(moment().subtract(2, 'weeks'), sqlFormat); break;
-                case 'month': date = utils.dateFormat(moment().subtract(1, 'months'), sqlFormat); break;
-                case '2months': date = utils.dateFormat(moment().subtract(2, 'months'), sqlFormat); break;
-                case '3months': date = utils.dateFormat(moment().subtract(3, 'months'), sqlFormat); break;
+                case 'today': date = utils.dateFormat(dayjs(), sqlFormat); break;
+                case '3days': date = utils.dateFormat(dayjs().subtract(3, 'days'), sqlFormat); break;
+                case 'week': date = utils.dateFormat(dayjs().subtract(1, 'weeks'), sqlFormat); break;
+                case '2weeks': date = utils.dateFormat(dayjs().subtract(2, 'weeks'), sqlFormat); break;
+                case 'month': date = utils.dateFormat(dayjs().subtract(1, 'months'), sqlFormat); break;
+                case '2months': date = utils.dateFormat(dayjs().subtract(2, 'months'), sqlFormat); break;
+                case '3months': date = utils.dateFormat(dayjs().subtract(3, 'months'), sqlFormat); break;
                 default:
                     date = '';
             }
@@ -501,9 +541,9 @@ export default class BaseList {
     }
 
     getQuery() {
-        let newQuery = _.cloneDeep(this.search);
-        newQuery = newQuery.setDefaults(newQuery);
-        delete newQuery.setDefaults;
+        const search = (this.isExtendedSearch ? this.extSearch : this.search);
+        const newQuery = {};
+        search.setDefaults(newQuery, search);
 
         //дата
         if (newQuery.date) {
@@ -514,8 +554,8 @@ export default class BaseList {
         newQuery.offset = (newQuery.page - 1)*newQuery.limit;
 
         //del
-        if (!this.showDeleted)
-            newQuery.del = 0;
+        if (!newQuery.del && !this.showDeleted)
+            newQuery.del = '0';
 
         return newQuery;
     }

client/components/Search/BookInfoDialog/BookInfoDialog.vue

@@ -0,0 +1,348 @@
+<template>
+    <Dialog ref="dialog" v-model="dialogVisible">
+        <template #header>
+            <div class="row items-center">
+                <div style="font-size: 110%">
+                    Информация о книге
+                </div>
+            </div>
+        </template>
+
+        <div ref="box" class="fit column q-mt-xs overflow-auto no-wrap" style="padding: 0px 10px 10px 10px;">
+            <div class="text-green-10">
+                {{ bookAuthor }}
+            </div>
+            <div>
+                <b>{{ book.title }}</b>
+            </div>
+
+            <div class="row q-mt-sm no-wrap">
+                <div class="poster-size">
+                    <div class="column justify-center items-center" :class="{'poster': coverSrc, 'no-poster': !coverSrc}" @click.stop.prevent="posterClick">
+                        <img v-if="coverSrc" :src="coverSrc" class="fit row justify-center items-center" style="object-fit: contain" @error="coverSrc = ''" />
+                        <div v-if="!coverSrc" class="fit row justify-center items-center text-grey-5 overflow-hidden" style="border: 1px solid #ccc; font-size: 300%">
+                            <i>{{ book.ext }}</i>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="col column q-ml-sm" style="min-width: 400px; border: 1px solid #ccc">
+                    <div class="bg-grey-3 row">
+                        <q-tabs
+                            v-model="selectedTab"
+                            active-color="black"
+                            active-bg-color="white"
+                            indicator-color="white"
+                            dense
+                            no-caps
+                            inline-label
+                            class="bg-grey-4 text-grey-7"
+                        >
+                            <q-tab v-if="fb2.length" name="fb2" label="Fb2 инфо" />
+                            <q-tab name="inpx" label="Inpx инфо" />
+                        </q-tabs>
+                    </div>
+
+                    <div class="overflow-auto full-width" style="height: 262px">
+                        <div v-for="item in info" :key="item.name">
+                            <div class="row q-ml-sm q-mt-sm items-center">
+                                <div class="text-blue" style="font-size: 90%">
+                                    {{ item.label }}
+                                </div>
+                                <div class="col q-mx-xs" style="height: 0px; border-top: 1px solid #ccc"></div>
+                            </div>
+
+                            <div v-for="subItem in item.value" :key="subItem.name" class="row q-ml-md">
+                                <div style="width: 100px">
+                                    {{ subItem.label }}
+                                </div>
+                                <div class="q-ml-sm" v-html="subItem.value" />
+                            </div>
+                        </div>
+
+                        <div class="q-mt-xs"></div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="q-mt-md" v-html="annotation" />
+        </div>
+
+        <template #footer>
+            <q-btn class="q-px-md q-ml-sm" color="primary" dense no-caps @click="okClick">
+                OK
+            </q-btn>
+        </template>
+
+
+        <Dialog v-model="posterDialogVisible">
+            <template #header>
+                <div class="row items-center">
+                    <div style="font-size: 110%">
+                        Обложка
+                    </div>
+                </div>
+            </template>
+
+            <img :src="coverSrc" class="fit q-pb-sm" style="height: 100%; max-height: calc(100vh - 140px); object-fit: contain" />
+        </Dialog>
+    </Dialog>
+</template>
+
+<script>
+//-----------------------------------------------------------------------------
+import vueComponent from '../../vueComponent.js';
+
+import Dialog from '../../share/Dialog.vue';
+import Fb2Parser from '../../../../server/core/fb2/Fb2Parser';
+import * as utils from '../../../share/utils';
+import _ from 'lodash';
+
+const componentOptions = {
+    components: {
+        Dialog
+    },
+    watch: {
+        modelValue(newValue) {
+            this.dialogVisible = newValue;
+            if (newValue)
+                this.init();
+        },
+        dialogVisible(newValue) {
+            this.$emit('update:modelValue', newValue);
+        },
+    }
+};
+class BookInfoDialog {
+    _options = componentOptions;
+    _props = {
+        modelValue: Boolean,
+        bookInfo: Object,
+    };
+
+    dialogVisible = false;
+    posterDialogVisible = false;
+    selectedTab = 'fb2';
+
+    //info props
+    coverSrc = '';
+    annotation = '';
+    fb2 = [];
+    book = {};
+
+    created() {
+        this.commit = this.$store.commit;
+    }
+
+    mounted() {
+    }
+
+    init() {
+        //defaults
+        this.coverSrc = '';
+        this.annotation = '';
+        this.fb2 = [];
+        this.book = {};
+
+        this.parseBookInfo();
+
+        if (!this.fb2.length)
+            this.selectedTab = 'inpx';
+    }
+
+    get bookAuthor() {
+        if (this.book.author) {
+            let a = this.book.author.split(',');
+            return a.slice(0, 3).join(', ') + (a.length > 3 ? ' и др.' : '');
+        }
+
+        return '';
+    }
+
+    formatSize(size) {
+        size = size/1024;
+        let unit = 'KB';
+        if (size > 1024) {
+            size = size/1024;
+            unit = 'MB';
+        }
+        return `${size.toFixed(1)} ${unit}`;
+    }
+
+    get inpx() {
+        const mapping = [
+            {name: 'fileInfo', label: 'Информация о файле', value: [
+                {name: 'folder', label: 'Папка'},
+                {name: 'file', label: 'Файл'},
+                {name: 'size', label: 'Размер'},
+                {name: 'date', label: 'Добавлен'},
+                {name: 'del', label: 'Удален'},
+                {name: 'libid', label: 'LibId'},
+                {name: 'insno', label: 'InsideNo'},
+            ]},
+
+            {name: 'titleInfo', label: 'Общая информация', value: [
+                {name: 'author', label: 'Автор(ы)'},
+                {name: 'title', label: 'Название'},
+                {name: 'series', label: 'Серия'},
+                {name: 'genre', label: 'Жанр'},
+                {name: 'librate', label: 'Оценка'},
+                {name: 'lang', label: 'Язык книги'},
+                {name: 'keywords', label: 'Ключевые слова'},
+            ]},
+        ];
+
+        const valueToString = (value, nodePath, b) => {//eslint-disable-line no-unused-vars
+            if (nodePath == 'fileInfo/file')
+                return `${value}.${b.ext}`;
+
+            if (nodePath == 'fileInfo/size')
+                return `${this.formatSize(value)} (${value.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1 ')} Bytes)`;
+
+            if (nodePath == 'fileInfo/date')
+                return utils.sqlDateFormat(value);
+
+            if (nodePath == 'fileInfo/del')
+                return (value ? 'Да' : null);
+
+            if (nodePath == 'fileInfo/insno')
+                return (value ? value : null);
+
+            if (nodePath == 'titleInfo/author')
+                return value.split(',').join(', ');
+
+            if (nodePath == 'titleInfo/librate' && !value)
+                return null;
+
+            if (typeof(value) === 'string') {
+                return value;
+            }
+
+            return (value.toString ? value.toString() : '');
+        };
+
+        let result = [];
+        const book = _.cloneDeep(this.book);
+        book.series = [book.series, book.serno].filter(v => v).join(' #');
+
+        for (const item of mapping) {
+            const itemOut = {name: item.name, label: item.label, value: []};
+
+            for (const subItem of item.value) {
+                const subItemOut = {
+                    name: subItem.name,
+                    label: subItem.label,
+                    value: valueToString(book[subItem.name], `${item.name}/${subItem.name}`, book)
+                };
+                if (subItemOut.value)
+                    itemOut.value.push(subItemOut);
+            }
+
+            if (itemOut.value.length)
+                result.push(itemOut);
+        }
+
+        return result;
+    }
+
+    get info() {
+        let result = [];
+
+        switch (this.selectedTab) {
+            case 'fb2':
+                return this.fb2;
+            case 'inpx':
+                return this.inpx;
+        }
+
+        return result;
+    }
+
+    parseBookInfo() {
+        const bookInfo = this.bookInfo;
+
+        //cover
+        if (bookInfo.cover)
+            this.coverSrc = bookInfo.cover;
+
+        //fb2
+        if (bookInfo.fb2) {
+            const parser = new Fb2Parser(bookInfo.fb2);
+
+            const infoObj = parser.bookInfo();
+
+            if (infoObj.titleInfo) {
+                let ann = infoObj.titleInfo.annotationHtml;
+                if (ann) {
+                    ann = ann.replace(/<p>/g, `<p class="p-annotation">`);
+                    this.annotation = ann;
+                }
+            }
+
+            this.fb2 = parser.bookInfoList(infoObj, {
+                valueToString(value, nodePath, origVTS) {//eslint-disable-line no-unused-vars
+                    if (nodePath == 'documentInfo/historyHtml' && value)
+                        return value.replace(/<p>/g, `<p class="p-history">`);
+
+                    return origVTS(value, nodePath);
+                },
+            });
+        }
+
+        //book
+        if (bookInfo.book)
+            this.book = bookInfo.book;
+    }
+
+    posterClick() {
+        if (!this.coverSrc)
+            return;
+
+        this.posterDialogVisible = true;
+    }
+
+    okClick() {
+        this.dialogVisible = false;
+    }
+}
+
+export default vueComponent(BookInfoDialog);
+//-----------------------------------------------------------------------------
+</script>
+
+<style scoped>
+.poster-size {
+    height: 300px;
+    width: 200px;
+    min-width: 100px;
+}
+
+.poster, .no-poster {
+    width: 100%;
+    height: 100%;
+}
+
+.poster:hover {
+    position: relative;
+    top: -1%;
+    left: -1%;
+    width: 102%;
+    height: 102%;
+    cursor: pointer;
+}
+
+</style>
+
+<style>
+.p-annotation {
+    text-indent: 20px;
+    text-align: justify;
+    padding: 0;
+    margin: 0;
+}
+
+.p-history {
+    padding: 0;
+    margin: 0;
+}
+</style>

client/components/Search/BookView/BookView.vue

@@ -33,18 +33,20 @@
         </div>
 
         <div class="q-ml-sm column">
-            <div v-if="(mode == 'series' || mode == 'title') && bookAuthor" class="row items-center clickable2 text-green-10" @click="selectAuthor">
-                {{ bookAuthor }}
+            <div v-if="(mode == 'series' || mode == 'title' || mode == 'extended') && bookAuthor" class="row">
+                <div class="clickable2 text-green-10" @click.stop.prevent="emit('authorClick')">
+                    {{ bookAuthor }}
+                </div>
             </div>
 
             <div class="row items-center">
                 <div v-if="book.serno" class="q-mr-xs">
                     {{ book.serno }}.
                 </div>
-                <div class="clickable2" :class="titleColor" @click="selectTitle">
+                <div class="clickable2" :class="titleColor" @click.stop.prevent="emit('titleClick')">
                     {{ book.title }}
                 </div>
-                <div v-if="mode == 'title' && bookSeries" class="q-ml-xs clickable2" @click="selectSeries">
+                <div v-if="(mode == 'title' || mode == 'extended') && bookSeries" class="q-ml-xs clickable2" @click.stop.prevent="emit('seriesClick')">
                     {{ bookSeries }}
                 </div>
 
@@ -53,15 +55,19 @@
                     {{ bookSize }}, {{ book.ext }}
                 </div>
 
-                <div class="q-ml-sm clickable" @click="download">
+                <div v-if="showInfo" class="q-ml-sm clickable" @click.stop.prevent="emit('bookInfo')">
+                    (инфо)
+                </div>
+
+                <div class="q-ml-sm clickable" @click.stop.prevent="emit('download')">
                     (скачать)
                 </div>
 
-                <div class="q-ml-sm clickable" @click="copyLink">
+                <div class="q-ml-sm clickable" @click.stop.prevent="emit('copyLink')">
                     <q-icon name="la la-copy" size="20px" />
                 </div>
 
-                <div v-if="showReadLink" class="q-ml-sm clickable" @click="readBook">
+                <div v-if="showReadLink" class="q-ml-sm clickable" @click.stop.prevent="emit('readBook')">
                     (читать)
                 </div>
 
@@ -73,10 +79,10 @@
                     {{ bookDate }}
                 </div>
             </div>
-        </div>
 
-        <div v-show="false">
-            {{ book }}
+            <div v-show="showJson && mode == 'extended'">
+                <pre style="font-size: 80%; white-space: pre-wrap;">{{ book }}</pre>
+            </div>
         </div>
     </div>
 </template>
@@ -107,9 +113,11 @@ class BookView {
     };
 
     showRates = true;
+    showInfo = true;
     showGenres = true;
     showDeleted = false;
     showDates = false;
+    showJson = false;
 
     created() {
         this.loadSettings();
@@ -119,9 +127,11 @@ class BookView {
         const settings = this.settings;
 
         this.showRates = settings.showRates;
+        this.showInfo = settings.showInfo;
         this.showGenres = settings.showGenres;
         this.showDates = settings.showDates;
         this.showDeleted = settings.showDeleted;
+        this.showJson = settings.showJson;
     }
 
     get settings() {
@@ -183,28 +193,8 @@ class BookView {
         return utils.sqlDateFormat(this.book.date);
     }
 
-    selectAuthor() {
-        this.$emit('bookEvent', {action: 'authorClick', book: this.book});
-    }
-
-    selectSeries() {
-        this.$emit('bookEvent', {action: 'seriesClick', book: this.book});
-    }
-
-    selectTitle() {
-        this.$emit('bookEvent', {action: 'titleClick', book: this.book});
-    }
-
-    download() {
-        this.$emit('bookEvent', {action: 'download', book: this.book});
-    }
-
-    copyLink() {
-        this.$emit('bookEvent', {action: 'copyLink', book: this.book});
-    }
-
-    readBook() {
-        this.$emit('bookEvent', {action: 'readBook', book: this.book});
+    emit(action) {
+        this.$emit('bookEvent', {action, book: this.book});
     }
 }
 

client/components/Search/ExtendedList/ExtendedList.vue

@@ -0,0 +1,134 @@
+<template>
+    <div>
+        <a ref="download" style="display: none;"></a>
+
+        <LoadingMessage :message="loadingMessage" z-index="2" />
+        <LoadingMessage :message="loadingMessage2" z-index="1" />
+
+        <!-- Формирование списка ------------------------------------------------------------------------>
+        <div v-for="item in tableData" :key="item.key" class="column" :class="{'odd-item': item.num % 2}" style="font-size: 120%">
+            <BookView
+                class="q-ml-md"
+                :book="item.book" mode="extended" :genre-map="genreMap" :show-read-link="showReadLink" @book-event="bookEvent"
+            />
+        </div>
+        <!-- Формирование списка конец ------------------------------------------------------------------>
+
+        <div v-if="!refreshing && (!tableData.length || error)" class="row items-center q-ml-md" style="font-size: 120%">
+            <q-icon class="la la-meh q-mr-xs" size="28px" />
+            {{ (error ? error : 'Поиск не дал результатов') }}
+        </div>
+    </div>
+</template>
+
+<script>
+//-----------------------------------------------------------------------------
+import vueComponent from '../../vueComponent.js';
+import { reactive } from 'vue';
+
+import BaseList from '../BaseList';
+
+import * as utils from '../../../share/utils';
+
+import _ from 'lodash';
+
+class ExtendedList extends BaseList {
+    created() {
+        super.created();
+        this.isExtendedSearch = true;
+    }
+
+    get foundCountMessage() {
+        return `${this.list.totalFound} ссыл${utils.wordEnding(this.list.totalFound, 5)} на файл(ы)`;
+    }
+
+    async updateTableData() {
+        let result = [];
+
+        const books = this.searchResult.found;
+        if (!books)
+            return;
+
+        let num = 0;
+        for (const book of books) {
+            const item = reactive({
+                num: num++,
+                book,
+            });
+
+            result.push(item);
+        }
+
+        this.tableData = result;
+    }
+
+    async refresh() {
+        //параметры запроса
+        const newQuery = this.getQuery();
+        if (_.isEqual(newQuery, this.prevQuery))
+            return;
+        this.prevQuery = newQuery;
+
+        this.queryExecute = newQuery;
+
+        if (this.refreshing)
+            return;
+
+        this.error = '';
+        this.refreshing = true;
+
+        (async() => {
+            await utils.sleep(500);
+            if (this.refreshing)
+                this.loadingMessage = 'Поиск книг...';
+        })();
+
+        try {
+            while (this.queryExecute) {
+                const query = this.queryExecute;
+                this.queryExecute = null;
+
+                try {
+                    const response = await this.api.bookSearch(query);
+
+                    this.list.queryFound = response.found.length;
+                    this.list.totalFound = response.totalFound;
+                    this.list.inpxHash = response.inpxHash;
+
+                    this.searchResult = response;
+
+                    await utils.sleep(1);
+                    if (!this.queryExecute) {
+                        await this.updateTableData();
+                        this.scrollToTop();
+                        this.highlightPageScroller(query);
+                    }
+                } catch (e) {
+                    this.list.queryFound = 0;
+                    this.list.totalFound = 0;
+                    this.searchResult = {found: []};
+                    await this.updateTableData();
+                    //this.$root.stdDialog.alert(e.message, 'Ошибка');
+                    this.error = `Ошибка: ${e.message}`;
+                }
+            }
+        } finally {
+            this.refreshing = false;
+            this.loadingMessage = '';
+        }
+    }
+}
+
+export default vueComponent(ExtendedList);
+//-----------------------------------------------------------------------------
+</script>
+
+<style scoped>
+.clickable2 {
+    cursor: pointer;
+}
+
+.odd-item {
+    background-color: #e8e8e8;
+}
+</style>

client/components/Search/SelectDateDialog/SelectDateDialog.vue

@@ -2,7 +2,7 @@
     <Dialog ref="dialog" v-model="dialogVisible">
         <template #header>
             <div class="row items-center">
-                <div style="font-size: 130%">
+                <div style="font-size: 110%">
                     Выбрать даты
                 </div>
             </div>

client/components/Search/SelectExtDialog/SelectExtDialog.vue

@@ -0,0 +1,187 @@
+<template>
+    <Dialog ref="dialog" v-model="dialogVisible">
+        <template #header>
+            <div class="row items-center">
+                <div style="font-size: 110%">
+                    Выбрать типы файлов
+                </div>
+            </div>
+        </template>
+
+        <div ref="box" class="column q-mt-xs overflow-auto no-wrap" style="width: 370px; padding: 0px 10px 10px 10px;">
+            <div v-show="extList.length" class="checkbox-tick-all">
+                <div class="row items-center">
+                    <q-option-group
+                        v-model="ticked"
+                        :options="optionsPre"
+                        type="checkbox"
+                        inline
+                    >
+                        <template #label="opt">
+                            <div class="row items-center" style="width: 35px">
+                                <span>{{ opt.label }}</span>
+                            </div>
+                        </template>
+                    </q-option-group>
+                </div>
+
+                <q-checkbox v-model="tickAll" label="Выбрать/снять все" toggle-order="ft" @update:model-value="makeTickAll" />
+            </div>
+
+            <q-option-group
+                v-model="ticked"
+                :options="options"
+                type="checkbox"
+            >
+            </q-option-group>
+        </div>
+
+        <template #footer>
+            <q-btn class="q-px-md q-ml-sm" color="primary" dense no-caps @click="okClick">
+                OK
+            </q-btn>
+        </template>
+    </Dialog>
+</template>
+
+<script>
+//-----------------------------------------------------------------------------
+import vueComponent from '../../vueComponent.js';
+
+import Dialog from '../../share/Dialog.vue';
+
+const componentOptions = {
+    components: {
+        Dialog
+    },
+    watch: {
+        modelValue(newValue) {
+            this.dialogVisible = newValue;
+            if (newValue)
+                this.init();//no await
+        },
+        dialogVisible(newValue) {
+            this.$emit('update:modelValue', newValue);
+        },
+        ext() {
+            this.updateTicked();
+        },
+        ticked() {
+            this.checkAllTicked();
+            this.updateExt();
+        },
+    }
+};
+class SelectExtDialog {
+    _options = componentOptions;
+    _props = {
+        modelValue: Boolean,
+        ext: {type: String, value: ''},
+        extList: Array,
+    };
+
+    dialogVisible = false;
+
+    ticked = [];
+    tickAll = false;
+
+    created() {
+        this.commit = this.$store.commit;
+    }
+
+    mounted() {
+        this.updateTicked();
+    }
+
+    async init() {
+        //await this.$refs.dialog.waitShown();
+    }
+
+    get options() {
+        const result = [];
+
+        for (const ext of this.extList) {
+            if (ext.length <= 4)
+                result.push({label: ext, value: ext});
+        }
+
+        for (const ext of this.extList) {
+            if (ext.length > 4)
+                result.push({label: ext, value: ext});
+        }
+
+        return result;
+    }
+
+    get optionsPre() {
+        const result = [];
+
+        for (const ext of ['fb2', 'epub', 'mobi', 'pdf', 'djvu', 'doc', 'docx', 'rtf', 'xml', 'html', 'txt', 'zip']) {
+            if (this.extList.includes(ext)) {
+                result.push({label: ext, value: ext});
+            }
+        }
+
+        return result;
+    }
+
+    makeTickAll() {
+        if (this.tickAll) {
+            const newTicked = [];
+            for (const ext of this.extList) {
+                newTicked.push(ext);
+            }
+            this.ticked = newTicked;
+        } else {
+            this.ticked = [];
+            this.tickAll = false;
+        }
+    }
+
+    checkAllTicked() {
+        const ticked = new Set(this.ticked);
+
+        let newTickAll = !!(this.extList.length);
+        for (const ext of this.extList) {
+            if (!ticked.has(ext)) {
+                newTickAll = false;
+                break;
+            }
+        }
+
+        if (this.ticked.length && !newTickAll) {
+            this.tickAll = undefined;
+        } else {
+            this.tickAll = newTickAll;
+        }
+    }
+
+    updateTicked() {
+        this.ticked = this.ext.split('|').filter(s => s);
+    }
+
+    updateExt() {
+        this.$emit('update:ext', this.ticked.join('|'));
+    }
+
+    okClick() {
+        this.dialogVisible = false;
+    }
+}
+
+export default vueComponent(SelectExtDialog);
+//-----------------------------------------------------------------------------
+</script>
+
+<style scoped>
+.checkbox-tick-all {
+    border-bottom: 1px solid #bbbbbb;
+    margin-bottom: 7px;
+    padding: 5px 5px 2px 0px;
+}
+
+.clickable {
+    color: blue;
+    cursor: pointer;
+}
+</style>

client/components/Search/SelectExtSearchDialog/SelectExtSearchDialog.vue

@@ -0,0 +1,205 @@
+<template>
+    <Dialog ref="dialog" v-model="dialogVisible">
+        <template #header>
+            <div class="row items-center">
+                <div style="font-size: 110%">
+                    Расширенный поиск
+                </div>
+
+                <DivBtn class="q-ml-sm text-grey-5 bg-yellow-1" :size="28" :icon-size="24" icon="la la-question" round @click.stop.prevent="showSearchHelp">
+                    <template #tooltip>
+                        <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
+                            Памятка
+                        </q-tooltip>
+                    </template>
+                </DivBtn>
+            </div>
+        </template>
+
+        <div ref="box" class="column q-mt-xs overflow-auto" style="max-width: 660px; padding: 0px 10px 10px 10px;">
+            <div class="row">
+                <div v-for="f in recStruct" :key="f.field" class="row">
+                    <div class="q-mx-xs" />
+                    <q-input
+                        v-model="search[f.field]" :maxlength="5000"
+                        class="q-mt-xs" style="width: 150px;" :label="`(${f.type}) ${f.field}`"
+                        :bg-color="bgColor[f.field] || 'white'"
+                        stack-label outlined dense clearable
+                        @keydown="onKeyDown"
+                    >
+                        <q-tooltip v-if="search[f.field]" :delay="500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
+                            {{ search[f.field] }}
+                        </q-tooltip>
+                    </q-input>
+                </div>
+            </div>
+            <div class="row q-mt-xs q-ml-sm" style="color: red" v-html="error" />
+        </div>
+
+        <template #footer>
+            <q-btn class="q-px-md q-ml-sm" color="primary" dense no-caps :disabled="error !== ''" @click="apply">
+                Применить
+            </q-btn>
+        </template>
+    </Dialog>
+</template>
+
+<script>
+//-----------------------------------------------------------------------------
+import vueComponent from '../../vueComponent.js';
+
+import Dialog from '../../share/Dialog.vue';
+import DivBtn from '../../share/DivBtn.vue';
+
+import _ from 'lodash';
+
+const componentOptions = {
+    components: {
+        Dialog,
+        DivBtn,
+    },
+    watch: {
+        modelValue(newValue) {
+            this.dialogVisible = newValue;
+        },
+        dialogVisible(newValue) {
+            this.$emit('update:modelValue', newValue);
+        },
+        extSearch: {
+            handler(newValue) {
+                this.search = _.cloneDeep(newValue);
+            },
+            deep: true,
+        },
+        search: {
+            handler() {
+                this.validate();
+            },
+            deep: true,
+        },
+    }
+};
+class SelectExtSearchDialog {
+    _options = componentOptions;
+    _props = {
+        modelValue: Boolean,
+        extSearch: Object,
+    };
+
+    dialogVisible = false;
+    search = {};
+    bgColor = {};
+    error = '';
+
+    created() {
+        this.commit = this.$store.commit;
+    }
+
+    mounted() {
+    }
+
+    get config() {
+        return this.$store.state.config;
+    }
+
+    get recStruct() {
+        if (this.config.dbConfig && this.config.dbConfig.inpxInfo.recStruct)
+            return this.config.dbConfig.inpxInfo.recStruct;
+        else
+            return [];
+    }
+
+    validate() {
+        const validNumValue = (n) => {
+            const validChars = new Set('0123456789.'.split(''));
+            for (const c of n.split(''))
+                if (!validChars.has(c))
+                    return false;
+
+            const v = n.split('..');
+            if ( isNaN(parseInt(v[0] || '0', 10)) || isNaN(parseInt(v[1] || '0', 10)) )
+                return false;
+
+            return true;
+        };
+
+        let error = [];
+        const s = this.search;
+        for (const f of this.recStruct) {
+            if (f.type == 'N' && s[f.field] && !validNumValue(s[f.field])) {
+                error.push(`Недопустимое значение поля ${f.field}`);
+                this.bgColor[f.field] = 'red-2';
+            } else {
+                this.bgColor[f.field] = '';//default
+            }
+        }
+
+        this.error = error.join('<br>');
+    }
+
+    showSearchHelp() {
+        let info = `<div style="min-width: 250px" />`;
+        info += `
+<p>
+    Расширенный поиск ведется непосредственно по значениям атрибутов записей описания книг.
+    Атрибуты можно увидеть, если включить опцию "Показывать JSON".
+    Названия атрибутов (кроме "_uid" и "id") соответствуют названиям полей струкутры записей из inpx-файла.
+    На поисковые значения действуют те же правила, что и для разделов "Авторы", "Серии", "Книги".
+    <br><br>
+    Для строковых значений (S):
+    <ul>
+        <li>
+            без префикса: значение трактуется, как "начинается с"
+        </li>
+        <li>
+            префикс "=": поиск по точному совпадению
+        </li>
+        <li>
+            префикс "*": поиск подстроки в строке
+        </li>
+        <li>
+            префикс "#": поиск подстроки в строке, но только среди начинающихся не с латинского или кириллического символа
+        </li>
+        <li>
+            префикс "~": поиск по регулярному выражению
+        </li>
+        <li>
+            префикс "?": поиск пустых значений или тех, что начинаются с этого символа
+        </li>
+    </ul>
+    Для числовых значений (N):
+    <ul>
+        <li>
+            число N: поиск по точному совпадению
+        </li>
+        <li>
+            диапазон N..M: поиск по диапазону числовых значений, включая N и M. Например, поисковое значение 1024..2048 в поле "size"
+            найдет все ссылки на файлы размером от 1КБ до 2КБ.
+        </li>
+    </ul>
+</p>
+`;
+
+        this.$root.stdDialog.alert(info, 'Памятка', {iconName: 'la la-info-circle'});
+    }
+
+    onKeyDown(event) {
+        if (event.code == 'Enter')
+            this.apply();
+    }
+
+    apply() {
+        this.validate();
+        if (!this.error) {
+            this.$emit('update:extSearch', _.cloneDeep(this.search));
+            this.dialogVisible = false;
+        }
+    }
+}
+
+export default vueComponent(SelectExtSearchDialog);
+//-----------------------------------------------------------------------------
+</script>
+
+<style scoped>
+</style>

client/components/Search/SelectGenreDialog/SelectGenreDialog.vue

@@ -2,7 +2,7 @@
     <Dialog ref="dialog" v-model="dialogVisible">
         <template #header>
             <div class="row items-center">
-                <div style="font-size: 130%">
+                <div style="font-size: 110%">
                     Выбрать жанры
                 </div>
             </div>

client/components/Search/SelectLangDialog/SelectLangDialog.vue

@@ -2,7 +2,7 @@
     <Dialog ref="dialog" v-model="dialogVisible">
         <template #header>
             <div class="row items-center">
-                <div style="font-size: 130%">
+                <div style="font-size: 110%">
                     Выбрать языки
                 </div>
             </div>

client/components/Search/SelectLibRateDialog/SelectLibRateDialog.vue

@@ -2,7 +2,7 @@
     <Dialog ref="dialog" v-model="dialogVisible">
         <template #header>
             <div class="row items-center">
-                <div style="font-size: 130%">
+                <div style="font-size: 110%">
                     Выбрать оценки
                 </div>
             </div>

client/components/Search/SeriesList/SeriesList.vue

@@ -96,9 +96,9 @@
         </div>
         <!-- Формирование списка конец ------------------------------------------------------------------>
 
-        <div v-if="!refreshing && !tableData.length" class="row items-center q-ml-md" style="font-size: 120%">
+        <div v-if="!refreshing && (!tableData.length || error)" class="row items-center q-ml-md" style="font-size: 120%">
             <q-icon class="la la-meh q-mr-xs" size="28px" />
-            Поиск не дал результатов
+            {{ (error ? error : 'Поиск не дал результатов') }}
         </div>
     </div>
 </template>
@@ -234,6 +234,7 @@ class SeriesList extends BaseList {
         if (this.refreshing)
             return;
 
+        this.error = '';
         this.refreshing = true;
 
         (async() => {
@@ -263,7 +264,12 @@ class SeriesList extends BaseList {
                         this.highlightPageScroller(query);
                     }
                 } catch (e) {
-                    this.$root.stdDialog.alert(e.message, 'Ошибка');
+                    this.list.queryFound = 0;
+                    this.list.totalFound = 0;
+                    this.searchResult = {found: []};
+                    await this.updateTableData();
+                    //this.$root.stdDialog.alert(e.message, 'Ошибка');
+                    this.error = `Ошибка: ${e.message}`;
                 }
             }
         } finally {

client/components/Search/SettingsDialog/SettingsDialog.vue

@@ -0,0 +1,167 @@
+<template>
+    <Dialog ref="dialog" v-model="dialogVisible">
+        <template #header>
+            <div class="row items-center" style="font-size: 110%">
+                <q-icon class="q-mr-sm text-green" name="la la-cog" size="28px"></q-icon>
+                Настройки
+            </div>
+        </template>
+
+        <div class="q-mx-md column" style="min-width: 300px; font-size: 120%;">
+            <div class="row items-center q-ml-sm">
+                <div class="q-mr-sm">
+                    Результатов на странице
+                </div>
+                <q-select
+                    v-model="limit" :options="limitOptions" class="bg-white"
+                    dropdown-icon="la la-angle-down la-sm"
+                    outlined dense emit-value map-options
+                />
+            </div>
+
+            <q-checkbox v-show="config.latestVersion" v-model="showNewReleaseAvailable" size="36px" label="Уведомлять о выходе новой версии" />
+            <q-checkbox v-model="downloadAsZip" size="36px" label="Скачивать книги в виде zip-архива" />
+            <q-checkbox v-model="showCounts" size="36px" label="Показывать количество" />
+            <q-checkbox v-model="showRates" size="36px" label="Показывать оценки" />
+            <q-checkbox v-model="showInfo" size="36px" label="Показывать кнопку (инфо)" />
+            <q-checkbox v-model="showGenres" size="36px" label="Показывать жанры" />
+            <q-checkbox v-model="showDates" size="36px" label="Показывать даты поступления" />
+            <q-checkbox v-model="showDeleted" size="36px" label="Показывать удаленные" />
+            <q-checkbox v-model="abCacheEnabled" size="36px" label="Кешировать запросы" />
+        </div>
+
+        <template #footer>
+            <q-btn class="q-px-md q-ml-sm" color="primary" dense no-caps @click="okClick">
+                OK
+            </q-btn>
+        </template>
+    </Dialog>
+</template>
+
+<script>
+//-----------------------------------------------------------------------------
+import vueComponent from '../../vueComponent.js';
+
+import Dialog from '../../share/Dialog.vue';
+
+const componentOptions = {
+    components: {
+        Dialog
+    },
+    watch: {
+        modelValue(newValue) {
+            this.dialogVisible = newValue;
+        },
+        dialogVisible(newValue) {
+            this.$emit('update:modelValue', newValue);
+        },
+
+        settings() {
+            this.loadSettings();
+        },
+        limit(newValue) {
+            this.commit('setSettings', {'limit': newValue});
+        },
+        downloadAsZip(newValue) {
+            this.commit('setSettings', {'downloadAsZip': newValue});
+        },
+        showCounts(newValue) {
+            this.commit('setSettings', {'showCounts': newValue});
+        },
+        showRates(newValue) {
+            this.commit('setSettings', {'showRates': newValue});
+        },
+        showInfo(newValue) {
+            this.commit('setSettings', {'showInfo': newValue});
+        },
+        showGenres(newValue) {
+            this.commit('setSettings', {'showGenres': newValue});
+        },
+        showDates(newValue) {
+            this.commit('setSettings', {'showDates': newValue});
+        },
+        showDeleted(newValue) {
+            this.commit('setSettings', {'showDeleted': newValue});
+        },
+        abCacheEnabled(newValue) {
+            this.commit('setSettings', {'abCacheEnabled': newValue});
+        },
+        showNewReleaseAvailable(newValue) {
+            this.commit('setSettings', {'showNewReleaseAvailable': newValue});
+        },
+    }
+};
+class SettingsDialog {
+    _options = componentOptions;
+    _props = {
+        modelValue: Boolean,
+    };
+
+    dialogVisible = false;
+
+    //settings
+    limit = 20;
+    downloadAsZip = false;
+    showCounts = true;
+    showRates = true;
+    showInfo = true;
+    showGenres = true;
+    showDates = true;
+    showDeleted = false;
+    abCacheEnabled = true;
+    showNewReleaseAvailable = true;
+
+    limitOptions = [
+        {label: '10', value: 10},
+        {label: '20', value: 20},
+        {label: '50', value: 50},
+        {label: '100', value: 100},
+        {label: '200', value: 200},
+        {label: '500', value: 500},
+        {label: '1000', value: 1000},
+    ];
+
+    created() {
+        this.commit = this.$store.commit;
+
+        this.loadSettings();
+    }
+
+    mounted() {
+    }
+
+    get config() {
+        return this.$store.state.config;
+    }
+
+    get settings() {
+        return this.$store.state.settings;
+    }
+
+    loadSettings() {
+        const settings = this.settings;
+
+        this.limit = settings.limit;
+
+        this.downloadAsZip = settings.downloadAsZip;
+        this.showCounts = settings.showCounts;
+        this.showRates = settings.showRates;
+        this.showInfo = settings.showInfo;
+        this.showGenres = settings.showGenres;
+        this.showDates = settings.showDates;
+        this.showDeleted = settings.showDeleted;
+        this.abCacheEnabled = settings.abCacheEnabled;
+        this.showNewReleaseAvailable = settings.showNewReleaseAvailable;
+    }
+
+    okClick() {
+        this.dialogVisible = false;
+    }
+}
+
+export default vueComponent(SettingsDialog);
+//-----------------------------------------------------------------------------
+</script>
+
+<style scoped>
+</style>

client/components/Search/TitleList/TitleList.vue

@@ -22,9 +22,9 @@
         </div>
         <!-- Формирование списка конец ------------------------------------------------------------------>
 
-        <div v-if="!refreshing && !tableData.length" class="row items-center q-ml-md" style="font-size: 120%">
+        <div v-if="!refreshing && (!tableData.length || error)" class="row items-center q-ml-md" style="font-size: 120%">
             <q-icon class="la la-meh q-mr-xs" size="28px" />
-            Поиск не дал результатов
+            {{ (error ? error : 'Поиск не дал результатов') }}
         </div>
     </div>
 </template>
@@ -95,6 +95,7 @@ class TitleList extends BaseList {
         if (this.refreshing)
             return;
 
+        this.error = '';
         this.refreshing = true;
 
         (async() => {
@@ -124,7 +125,12 @@ class TitleList extends BaseList {
                         this.highlightPageScroller(query);
                     }
                 } catch (e) {
-                    this.$root.stdDialog.alert(e.message, 'Ошибка');
+                    this.list.queryFound = 0;
+                    this.list.totalFound = 0;
+                    this.searchResult = {found: []};
+                    await this.updateTableData();
+                    //this.$root.stdDialog.alert(e.message, 'Ошибка');
+                    this.error = `Ошибка: ${e.message}`;
                 }
             }
         } finally {

client/components/Search/authorBooksStorage.js

@@ -8,6 +8,8 @@ const abStore = localForage.createInstance({
     name: 'authorBooksStorage'
 });
 
+const storageVersion = '1';
+
 class AuthorBooksStorage {
     constructor() {
     }
@@ -17,6 +19,8 @@ class AuthorBooksStorage {
     }
 
     async setData(key, data) {
+        key += storageVersion;
+
         if (typeof data !== 'string')
             throw new Error('AuthorBooksStorage: data must be a string');
 
@@ -25,6 +29,8 @@ class AuthorBooksStorage {
     }
 
     async getData(key) {
+        key += storageVersion;
+
         const item = await abStore.getItem(key);
         
         //обновим addTime
@@ -34,9 +40,9 @@ class AuthorBooksStorage {
         return item;
     }
 
-    async removeData(key) {
-        await abStore.removeItem(key);
-        await abStore.removeItem(`addTime-${key}`);
+    async _removeData(fullKey) {
+        await abStore.removeItem(fullKey);
+        await abStore.removeItem(`addTime-${fullKey}`);
     }
 
     async cleanStorage() {
@@ -62,7 +68,7 @@ class AuthorBooksStorage {
             }
 
             if (size > maxDataSize && toDel) {
-                await this.removeData(toDel);
+                await this._removeData(toDel);
             } else {
                 break;
             }

client/components/share/DivBtn.vue

@@ -1,5 +1,5 @@
 <template>
-    <div ref="btn" class="button clickable row justify-center items-center" @click="clickEffect">
+    <div ref="btn" class="button clickable row justify-center items-center" :class="{disabled}" @click.stop.prevent="clickEffect">
         <div class="row justify-center items-center no-wrap" :class="{'button-pressed': pressed}">
             <i :class="icon" :style="`font-size: ${iconSize}px; margin-top: ${imt}px`" />
             <slot></slot>
@@ -29,8 +29,10 @@ class DivBtn {
         height: { type: Number, default: 0 },
         icon: { type: String, default: '' },
         iconSize: { type: Number, default: 14 },
-        round: { type: Boolean },
+        round: Boolean,
         imt:  { type: Number, default: 0 },// icon margin top
+        disabled: Boolean,
+        noShadow: Boolean,
     };
 
     pressed = false;
@@ -55,9 +57,17 @@ class DivBtn {
             style.borderRadius = `${this.size}px`;
         else
             style.borderRadius = `${this.size/10}px`;
+
+        if (!this.noShadow)
+            style.boxShadow = '0.5px 1px 3px #333333';
     }
 
-    async clickEffect() {
+    async clickEffect(event) {
+        if (this.disabled) {
+            return;
+        }
+
+        this.$emit('meClick', event);
         this.pressed = true;
         await utils.sleep(100);
         this.pressed = false;
@@ -71,7 +81,6 @@ export default vueComponent(DivBtn);
 <style scoped>
 .button {
     position: relative;
-    box-shadow: 0.5px 1px 3px #333333;
 }
 
 .button:hover {
@@ -80,8 +89,10 @@ export default vueComponent(DivBtn);
 }
 
 .button-pressed {
-    margin-left: 2px;
-    margin-top: 2px;
+    margin-left: 1px;
+    margin-top: 1px;
+    margin-right: -1px;
+    margin-bottom: -1px;
 }
 
 .clickable {

client/components/share/NumInput.vue

@@ -74,7 +74,8 @@ const componentOptions = {
             this.checkErrorAndEmit(true);
         },
         modelValue(newValue) {
-            this.filteredValue = newValue;
+            if (this.ready)//исправление бага TypeError: Cannot read properties of null (reading 'emitsOptions')
+                this.filteredValue = newValue;
         },
         min() {
             this.checkErrorAndEmit();
@@ -102,7 +103,8 @@ class NumInput {
     filteredValue = 0;
     error = false;
 
-    created() {
+    mounted() {
+        this.ready = true;
         this.filteredValue = this.modelValue;
     }
 

client/quasar.js

@@ -17,7 +17,7 @@ import {QBtn} from 'quasar/src/components/btn';
 import {QBtnToggle} from 'quasar/src/components/btn-toggle';
 import {QIcon} from 'quasar/src/components/icon';
 //import {QSlider} from 'quasar/src/components/slider';
-//import {QTabs, QTab} from 'quasar/src/components/tabs';
+import {QTabs, QTab} from 'quasar/src/components/tabs';
 //import {QTabPanels, QTabPanel} from 'quasar/src/components/tab-panels';
 //import {QSeparator} from 'quasar/src/components/separator';
 //import {QList} from 'quasar/src/components/item';
@@ -52,7 +52,7 @@ const components = {
     QBtnToggle,
     QIcon,
     //QSlider,
-    //QTabs, QTab,
+    QTabs, QTab,
     //QTabPanels, QTabPanel,
     //QSeparator,
     //QList,

client/router.js

@@ -8,6 +8,7 @@ const myRoutes = [
     ['/author', Search],
     ['/series', Search],
     ['/title', Search],
+    ['/extended', Search],
     ['/:pathMatch(.*)*', null, null, '/'],
 ];
 

client/share/utils.js

@@ -1,4 +1,4 @@
-import moment from 'moment';
+import dayjs from 'dayjs';
 import {Buffer} from 'safe-buffer';
 //import _ from 'lodash';
 
@@ -36,14 +36,14 @@ export function keyEventToCode(event) {
 
 export function wordEnding(num, type = 0) {
     const endings = [
-        ['ов', '', 'а', 'а', 'а', 'ов', 'ов', 'ов', 'ов', 'ов'],
-        ['й', 'я', 'и', 'и', 'и', 'й', 'й', 'й', 'й', 'й'],
-        ['о', '', 'о', 'о', 'о', 'о', 'о', 'о', 'о', 'о'],
-        ['ий', 'ие', 'ия', 'ия', 'ия', 'ий', 'ий', 'ий', 'ий', 'ий'],
-        ['о', 'а', 'о', 'о', 'о', 'о', 'о', 'о', 'о', 'о'],
-        ['ок', 'ка', 'ки', 'ки', 'ки', 'ок', 'ок', 'ок', 'ок', 'ок'],
-        ['ых', 'ое', 'ых', 'ых', 'ых', 'ых', 'ых', 'ых', 'ых', 'ых'],
-        ['о', 'о', 'о', 'о', 'о', 'о', 'о', 'о', 'о', 'о'],
+        ['ов', '', 'а', 'а', 'а', 'ов', 'ов', 'ов', 'ов', 'ов'],//0
+        ['й', 'я', 'и', 'и', 'и', 'й', 'й', 'й', 'й', 'й'],//1
+        ['о', '', 'о', 'о', 'о', 'о', 'о', 'о', 'о', 'о'],//2
+        ['ий', 'ие', 'ия', 'ия', 'ия', 'ий', 'ий', 'ий', 'ий', 'ий'],//3
+        ['о', 'а', 'о', 'о', 'о', 'о', 'о', 'о', 'о', 'о'],//4
+        ['ок', 'ка', 'ки', 'ки', 'ки', 'ок', 'ок', 'ок', 'ок', 'ок'],//5
+        ['ых', 'ое', 'ых', 'ых', 'ых', 'ых', 'ых', 'ых', 'ых', 'ых'],//6
+        ['о', 'о', 'о', 'о', 'о', 'о', 'о', 'о', 'о', 'о'],//7
     ];
     const deci = num % 100;
     if (deci > 10 && deci < 20) {
@@ -87,57 +87,16 @@ export async function copyTextToClipboard(text) {
     return result;
 }
 
-export function makeValidFilename(filename, repl = '_') {
-    let f = filename.replace(/[\x00\\/:*"<>|]/g, repl); // eslint-disable-line no-control-regex
-    f = f.trim();
-    while (f.length && (f[f.length - 1] == '.' || f[f.length - 1] == '_')) {
-        f = f.substring(0, f.length - 1);
-    }
-
-    if (f)
-        return f;
-    else
-        throw new Error('Invalid filename');
-}
-/*
-export function formatDate(d, format = 'normal') {
-    switch (format) {
-        case 'normal':
-            return `${d.getDate().toString().padStart(2, '0')}.${(d.getMonth() + 1).toString().padStart(2, '0')}.${d.getFullYear()} ` + 
-                `${d.getHours().toString().padStart(2, '0')}:${d.getMinutes().toString().padStart(2, '0')}`;
-        case 'coDate':
-            return `${d.getFullYear()}-${(d.getMonth() + 1).toString().padStart(2, '0')}-${d.getDate().toString().padStart(2, '0')}`;
-        case 'coMonth':
-            return `${(d.getMonth() + 1).toString().padStart(2, '0')}`;
-        case 'noDate':
-            return `${d.getDate().toString().padStart(2, '0')}.${(d.getMonth() + 1).toString().padStart(2, '0')}.${d.getFullYear()}`;
-
-        default:
-            throw new Error('formatDate: unknown date format');
-    }
-}
-
-export function parseDate(sqlDate) {
-    const d = sqlDate.split('-');
-    const result = new Date();
-    result.setDate(parseInt(d[2], 10));
-    result.setMonth(parseInt(d[1], 10) - 1);
-    result.setYear(parseInt(d[0], 10));
-        
-    return result;
-}
-*/
-
 export function isDigit(c) {
     return !isNaN(parseInt(c, 10));
 }
 
 export function dateFormat(date, format = 'DD.MM.YYYY') {
-    return moment(date).format(format);
+    return dayjs(date).format(format);
 }
 
 export function sqlDateFormat(date, format = 'DD.MM.YYYY') {
-    return moment(date, 'YYYY-MM-DD').format(format);
+    return dayjs(date, 'YYYY-MM-DD').format(format);
 }
 
 export function isManualDate(date) {

client/store/root.js

@@ -4,16 +4,24 @@ const state = {
     settings: {
         accessToken: '',
         extendedParams: false,
-        limit: 20,
         expandedAuthor: [],
         expandedSeries: [],
+
+        defaultsSet: false,
+        
+        //uiDefaults
+        limit: 20,
+        downloadAsZip: false,
         showCounts: true,
         showRates: true,
+        showInfo: true,
         showGenres: true,
         showDates: false,
         showDeleted: false,
         abCacheEnabled: true,
         langDefault: '',
+        showJson: false,
+        showNewReleaseAvailable: true,
     },    
 };
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "inpx-web",
-  "version": "1.1.2",
+  "version": "1.5.4",
   "author": "Book Pauk <bookpauk@gmail.com>",
   "license": "CC0-1.0",
   "repository": "bookpauk/inpx-web",
@@ -11,9 +11,11 @@
     "dev": "nodemon --inspect --ignore server/.inpx-web --ignore client --exec 'node --expose-gc server --lib-dir=server/.inpx-web/lib'",
     "build:client": "webpack --config build/webpack.prod.config.js",
     "build:linux": "npm run build:client && node build/prepkg.js linux && pkg -t node16-linux-x64 -C GZip --options max-old-space-size=4096,expose-gc -o dist/linux/inpx-web .",
+    "build:linux-arm64": "npm run build:client && node build/prepkg.js linux-arm64 && pkg -t node16-linuxstatic-arm64 -C GZip --options max-old-space-size=4096,expose-gc -o dist/linux-arm64/inpx-web .",
     "build:win": "npm run build:client && node build/prepkg.js win && pkg -t node16-win-x64 -C GZip --options max-old-space-size=4096,expose-gc -o dist/win/inpx-web .",
+    "build:macos": "npm run build:client && node build/prepkg.js macos && pkg -t node16-macos-x64 -C GZip --options max-old-space-size=4096,expose-gc -o dist/macos/inpx-web .",
     "build:client-dev": "webpack --config build/webpack.dev.config.js",
-    "build:all": "npm run build:linux && npm run build:win",
+    "build:all": "npm run build:linux && npm run build:win && npm run build:macos && npm run build:linux-arm64",
     "release": "npm run build:all && node build/release.js",
     "postinstall": "npm run build:client-dev"
   },
@@ -23,48 +25,54 @@
     "assets": "dist/public.json"
   },
   "devDependencies": {
-    "@babel/core": "^7.18.9",
-    "@babel/eslint-parser": "^7.18.9",
-    "@babel/eslint-plugin": "^7.17.7",
-    "@babel/plugin-proposal-decorators": "^7.18.9",
-    "@babel/preset-env": "^7.18.9",
+    "@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",
     "@vue/compiler-sfc": "^3.2.22",
-    "babel-loader": "^8.2.5",
+    "babel-loader": "^9.1.0",
     "copy-webpack-plugin": "^11.0.0",
-    "css-loader": "^6.7.1",
-    "css-minimizer-webpack-plugin": "^4.0.0",
-    "eslint": "^8.20.0",
-    "eslint-plugin-vue": "^9.3.0",
+    "css-loader": "^6.7.2",
+    "css-minimizer-webpack-plugin": "^4.2.2",
+    "eslint": "^8.28.0",
+    "eslint-plugin-vue": "^9.8.0",
     "html-webpack-plugin": "^5.5.0",
-    "mini-css-extract-plugin": "^2.6.1",
+    "mini-css-extract-plugin": "^2.7.1",
     "pkg": "^5.8.0",
-    "terser-webpack-plugin": "^5.3.3",
-    "vue-eslint-parser": "^9.0.3",
-    "vue-loader": "^17.0.0",
+    "showdown": "^2.1.0",
+    "terser-webpack-plugin": "^5.3.6",
+    "vue-eslint-parser": "^9.1.0",
+    "vue-loader": "^17.0.1",
     "vue-style-loader": "^4.1.3",
-    "webpack": "^5.74.0",
-    "webpack-cli": "^4.10.0",
-    "webpack-dev-middleware": "^5.3.3",
-    "webpack-hot-middleware": "^2.25.1",
+    "webpack": "^5.75.0",
+    "webpack-cli": "^5.0.0",
+    "webpack-dev-middleware": "^6.0.1",
+    "webpack-hot-middleware": "^2.25.3",
     "webpack-merge": "^5.8.0"
   },
   "dependencies": {
-    "@quasar/extras": "^1.15.0",
+    "@quasar/extras": "^1.15.6",
     "axios": "^0.27.2",
-    "express": "^4.18.1",
+    "chardet": "^1.5.0",
+    "dayjs": "^1.11.6",
+    "express": "^4.18.2",
+    "express-basic-auth": "^1.2.1",
     "fs-extra": "^10.1.0",
-    "jembadb": "^5.0.2",
+    "he": "^1.2.0",
+    "iconv-lite": "^0.6.3",
+    "jembadb": "^5.1.7",
     "localforage": "^1.10.0",
     "lodash": "^4.17.21",
-    "minimist": "^1.2.6",
-    "moment": "^2.29.4",
+    "minimist": "^1.2.7",
     "node-stream-zip": "^1.15.0",
-    "quasar": "^2.7.5",
+    "quasar": "^2.10.2",
     "safe-buffer": "^5.2.1",
     "vue": "^3.2.37",
-    "vue-router": "^4.1.2",
-    "vuex": "^4.0.2",
+    "vue-router": "^4.1.6",
+    "vuex": "^4.1.0",
     "vuex-persist": "^3.1.3",
-    "ws": "^8.8.1"
+    "ws": "^8.11.0",
+    "yazl": "^2.5.1"
   }
 }

server/config/base.js

@@ -6,28 +6,35 @@ const execDir = path.resolve(__dirname, '..');
 module.exports = {
     branch: 'unknown',
     version: pckg.version,
+    latestVersion: '',
     name: pckg.name,
 
     execDir,
+    libDir: '',
+    inpx: '',
 
     accessPassword: '',
+    accessTimeout: 0,
+    extendedSearch: true,
     bookReadLink: '',
     loggingEnabled: true,
 
-    //поправить в случае, если были критические изменения в DbCreator
-    //иначе будет рассинхронизация между сервером и клиентом на уровне БД
-    dbVersion: '5',
+    //поправить в случае, если были критические изменения в DbCreator или InpxParser
+    //иначе будет рассинхронизация по кешу между сервером и клиентом на уровне БД
+    dbVersion: '12',
     dbCacheSize: 5,
 
     maxPayloadSize: 500,//in MB
     maxFilesDirSize: 1024*1024*1024,//1Gb
     queryCacheEnabled: true,
+    queryCacheMemSize: 50,
+    queryCacheDiskSize: 500,
     cacheCleanInterval: 60,//minutes
     inpxCheckInterval: 60,//minutes
     lowMemoryMode: false,
     fullOptimization: false,
 
-    webConfigParams: ['name', 'version', 'branch', 'bookReadLink', 'dbVersion'],
+    webConfigParams: ['name', 'version', 'latestVersion', 'branch', 'bookReadLink', 'dbVersion', 'extendedSearch', 'latestReleaseLink', 'uiDefaults'],
 
     allowRemoteLib: false,
     remoteLib: false,
@@ -42,6 +49,32 @@ module.exports = {
     server: {
         host: '0.0.0.0',
         port: '22380',
+        root: '',
+    },
+    //opds: false,
+    opds: {
+        enabled: true,
+        user: '',
+        password: '',
+        root: '/opds',
+    },
+
+    latestReleaseLink: 'https://github.com/bookpauk/inpx-web/releases/latest',
+    checkReleaseLink: 'https://api.github.com/repos/bookpauk/inpx-web/releases/latest',
+
+    uiDefaults: {
+        limit: 20,
+        downloadAsZip: false,
+        showCounts: true,
+        showRates: true,
+        showInfo: true,
+        showGenres: true,
+        showDates: false,
+        showDeleted: false,
+        abCacheEnabled: true,
+        langDefault: '',
+        showJson: false,
+        showNewReleaseAvailable: true,
     },
 };
 

server/config/index.js

@@ -5,12 +5,18 @@ const fs = require('fs-extra');
 const branchFilename = __dirname + '/application_env';
 
 const propsToSave = [
+    'libDir',
+    'inpx',
     'accessPassword',
+    'accessTimeout',
+    'extendedSearch',
     'bookReadLink',
     'loggingEnabled',
     'dbCacheSize',
     'maxFilesDirSize',
     'queryCacheEnabled',
+    'queryCacheMemSize',
+    'queryCacheDiskSize',
     'cacheCleanInterval',
     'inpxCheckInterval',
     'lowMemoryMode',
@@ -18,6 +24,10 @@ const propsToSave = [
     'allowRemoteLib',
     'remoteLib',
     'server',
+    'opds',
+    'latestReleaseLink',
+    'checkReleaseLink',
+    'uiDefaults',
 ];
 
 let instance = null;

server/config/production.js

@@ -11,6 +11,7 @@ module.exports = Object.assign({}, base, {
     server: {
         host: '0.0.0.0',
         port: '12380',
+        root: '',
     },
 
 });

server/controllers/WebSocketController.js

@@ -10,12 +10,11 @@ const cleanPeriod = 1*60*1000;//1 минута
 const closeSocketOnIdle = 5*60*1000;//5 минут
 
 class WebSocketController {
-    constructor(wss, config) {
+    constructor(wss, webAccess, config) {
         this.config = config;
         this.isDevelopment = (config.branch == 'development');
-        this.accessToken = '';
-        if (config.accessPassword)
-            this.accessToken = utils.getBufHash(config.accessPassword, 'sha256', 'hex');
+
+        this.webAccess = webAccess;
 
         this.workerState = new WorkerState();
         this.webWorker = new WebWorker(config);
@@ -32,19 +31,25 @@ class WebSocketController {
             });
         });
 
-        setTimeout(() => { this.periodicClean(); }, cleanPeriod);
+        this.periodicClean();//no await
     }
 
-    periodicClean() {
-        try {
-            const now = Date.now();
-            this.wss.clients.forEach((ws) => {
-                if (!ws.lastActivity || now - ws.lastActivity > closeSocketOnIdle - 50) {
-                    ws.terminate();
-                }
-            });
-        } finally {
-            setTimeout(() => { this.periodicClean(); }, cleanPeriod);
+    async periodicClean() {
+        while (1) {//eslint-disable-line no-constant-condition
+            try {
+                const now = Date.now();
+
+                //почистим ws-клиентов
+                this.wss.clients.forEach((ws) => {
+                    if (!ws.lastActivity || now - ws.lastActivity > closeSocketOnIdle - 50) {
+                        ws.terminate();
+                    }
+                });
+            } catch(e) {
+                log(LM_ERR, `WebSocketController.periodicClean error: ${e.message}`);
+            }
+            
+            await utils.sleep(cleanPeriod);
         }
     }
 
@@ -62,28 +67,40 @@ class WebSocketController {
             //pong for WebSocketConnection
             this.send({_rok: 1}, req, ws);
 
-            if (this.accessToken && req.accessToken !== this.accessToken) {
-                await utils.sleep(1000);
-                throw new Error('need_access_token');
+            //access
+            if (!await this.webAccess.hasAccess(req.accessToken)) {
+                await utils.sleep(500);
+                const salt = this.webAccess.newToken();
+                this.send({error: 'need_access_token', salt}, req, ws);
+                return;
             }
 
+            //api
             switch (req.action) {
                 case 'test':
                     await this.test(req, ws); break;
+                case 'logout':
+                    await this.logout(req, ws); break;
                 case 'get-config':
                     await this.getConfig(req, ws); break;
                 case 'get-worker-state':
                     await this.getWorkerState(req, ws); break;
                 case 'search':
                     await this.search(req, ws); break;
+                case 'bookSearch':
+                    await this.bookSearch(req, ws); break;
                 case 'get-author-book-list':
                     await this.getAuthorBookList(req, ws); break;
+                case 'get-author-series-list':
+                    await this.getAuthorSeriesList(req, ws); break;
                 case 'get-series-book-list':
                     await this.getSeriesBookList(req, ws); break;
                 case 'get-genre-tree':
                     await this.getGenreTree(req, ws); break;
                 case 'get-book-link':
                     await this.getBookLink(req, ws); break;
+                case 'get-book-info':
+                    await this.getBookInfo(req, ws); break;
 
                 case 'get-inpx-file':
                     await this.getInpxFile(req, ws); break;
@@ -118,9 +135,15 @@ class WebSocketController {
         this.send({message: `${this.config.name} project is awesome`}, req, ws);
     }
 
+    async logout(req, ws) {
+        await this.webAccess.deleteAccess(req.accessToken);
+        this.send({success: true}, req, ws);
+    }
+
     async getConfig(req, ws) {
         const config = _.pick(this.config, this.config.webConfigParams);
         config.dbConfig = await this.webWorker.dbConfig();
+        config.freeAccess = this.webAccess.freeAccess;
 
         this.send(config, req, ws);
     }
@@ -144,12 +167,29 @@ class WebSocketController {
         this.send(result, req, ws);
     }
 
+    async bookSearch(req, ws) {
+        if (!this.config.extendedSearch)
+            throw new Error('config.extendedSearch disabled');
+        if (!req.query)
+            throw new Error(`query is empty`);
+
+        const result = await this.webWorker.bookSearch(req.query);
+
+        this.send(result, req, ws);
+    }
+
     async getAuthorBookList(req, ws) {
         const result = await this.webWorker.getAuthorBookList(req.authorId);
 
         this.send(result, req, ws);
     }
 
+    async getAuthorSeriesList(req, ws) {
+        const result = await this.webWorker.getAuthorSeriesList(req.authorId);
+
+        this.send(result, req, ws);
+    }
+
     async getSeriesBookList(req, ws) {
         const result = await this.webWorker.getSeriesBookList(req.series);
 
@@ -163,12 +203,19 @@ class WebSocketController {
     }
 
     async getBookLink(req, ws) {
-        if (!utils.hasProp(req, 'bookPath'))
-            throw new Error(`bookPath is empty`);
-        if (!utils.hasProp(req, 'downFileName'))
-            throw new Error(`downFileName is empty`);    
+        if (!utils.hasProp(req, 'bookUid'))
+            throw new Error(`bookUid is empty`);
 
-        const result = await this.webWorker.getBookLink({bookPath: req.bookPath, downFileName: req.downFileName});
+        const result = await this.webWorker.getBookLink(req.bookUid);
+
+        this.send(result, req, ws);
+    }
+
+    async getBookInfo(req, ws) {
+        if (!utils.hasProp(req, 'bookUid'))
+            throw new Error(`bookUid is empty`);
+
+        const result = await this.webWorker.getBookInfo(req.bookUid);
 
         this.send(result, req, ws);
     }

server/core/DbCreator.js

@@ -64,6 +64,10 @@ class DbCreator {
         let dateArr = [];
         let librateMap = new Map();//оценка
         let librateArr = [];
+        let extMap = new Map();//тип файла
+        let extArr = [];
+
+        let uidSet = new Set();//уникальные идентификаторы
 
         //stats
         let authorCount = 0;
@@ -213,6 +217,9 @@ class DbCreator {
 
             //оценка
             parseField(rec.librate, librateMap, librateArr, rec.id);
+
+            //тип файла
+            parseField(rec.ext, extMap, extArr, rec.id);
         };
 
         //основная процедура парсинга
@@ -221,13 +228,14 @@ class DbCreator {
             let filtered = false;
             for (const rec of chunk) {
                 //сначала фильтр
-                if (!filter(rec)) {
+                if (!filter(rec) || uidSet.has(rec._uid)) {
                     rec.id = 0;
                     filtered = true;
                     continue;
                 }
 
                 rec.id = ++id;
+                uidSet.add(rec._uid);
 
                 if (!rec.del) {
                     bookCount++;
@@ -258,7 +266,7 @@ class DbCreator {
 
         //парсинг
         const parser = new InpxParser();
-        await parser.parse(config.inpxFile, readFileCallback, parsedCallback);
+        await parser.parse(config.inpxFile, readFileCallback, parsedCallback);        
 
         //чистка памяти, ибо жрет как не в себя
         authorMap = null;
@@ -269,6 +277,9 @@ class DbCreator {
         delMap = null;
         dateMap = null;
         librateMap = null;
+        extMap = null;
+
+        uidSet = null;
 
         await db.close({table: 'book'});
         await db.freeMemory();
@@ -333,7 +344,7 @@ class DbCreator {
         //сохраним поисковые таблицы
         const chunkSize = 10000;
 
-        const saveTable = async(table, arr, nullArr, indexType = 'string') => {
+        const saveTable = async(table, arr, nullArr, indexType = 'string', delEmpty = false) => {
             
             if (indexType == 'string')
                 arr.sort((a, b) => a.value.localeCompare(b.value));
@@ -362,6 +373,13 @@ class DbCreator {
                 callback({progress: i/arr.length});                
             }
 
+            if (delEmpty) {
+                const delResult = await db.delete({table, where: `@@indexLR('value', '?', '?')`});
+                const statField = `${table}Count`;
+                if (stats[statField])
+                    stats[statField] -= delResult.deleted;
+            }
+
             nullArr();
             await db.close({table});
             utils.freeMemory();
@@ -374,7 +392,7 @@ class DbCreator {
 
         //series
         callback({job: 'series save', jobMessage: 'Сохранение индекса серий', jobStep: 4, progress: 0});
-        await saveTable('series', seriesArr, () => {seriesArr = null});
+        await saveTable('series', seriesArr, () => {seriesArr = null}, 'string', true);
 
         //title
         callback({job: 'title save', jobMessage: 'Сохранение индекса названий', jobStep: 5, progress: 0});
@@ -397,6 +415,9 @@ class DbCreator {
         //librate
         await saveTable('librate', librateArr, () => {librateArr = null}, 'number');
 
+        //ext
+        await saveTable('ext', extArr, () => {extArr = null});
+
         //кэш-таблицы запросов
         await db.create({table: 'query_cache'});
         await db.create({table: 'query_time'});
@@ -442,8 +463,16 @@ class DbCreator {
             table: 'config'
         });
 
+        const inpxInfo = parser.info;
+        if (inpxFilter && inpxFilter.info) {
+            if (inpxFilter.info.collection)
+                inpxInfo.collection = inpxFilter.info.collection;
+            if (inpxFilter.info.version)
+                inpxInfo.version = inpxFilter.info.version;
+        }
+
         await db.insert({table: 'config', rows: [
-            {id: 'inpxInfo', value: (inpxFilter && inpxFilter.info ? inpxFilter.info : parser.info)},
+            {id: 'inpxInfo', value: inpxInfo},
             {id: 'stats', value: stats},
             {id: 'inpxHash', value: await inpxHashCreator.getHash()},
         ]});
@@ -455,7 +484,6 @@ class DbCreator {
         const config = this.config;
 
         const to = `${from}_book`;
-        const toId = `${from}_id`;
 
         await db.open({table: from});
         await db.create({table: to});
@@ -544,7 +572,7 @@ class DbCreator {
                 await saveChunk(chunk);
 
                 processed += chunk.length;
-                callback({progress: 0.5*processed/fromLength});
+                callback({progress: 0.9*processed/fromLength});
             } else
                 break;
 
@@ -558,24 +586,18 @@ class DbCreator {
         await db.close({table: to});
         await db.close({table: from});
 
-        await db.create({table: toId});
-
-        const chunkSize = 50000;
-        let idRows = [];
-        let proc = 0;
+        const idMap = {arr: [], map: []};
         for (const [id, value] of bookId2RecId) {
-            idRows.push({id, value});
-            if (idRows.length >= chunkSize) {
-                await db.insert({table: toId, rows: idRows});
-                idRows = [];
-
-                proc += chunkSize;
-                callback({progress: 0.5 + 0.5*proc/bookId2RecId.size});
+            if (value.length > 1) {
+                idMap.map.push([id, value]);
+                idMap.arr[id] = 0;
+            } else {
+                idMap.arr[id] = value[0];
             }
         }
-        if (idRows.length)
-            await db.insert({table: toId, rows: idRows});
-        await db.close({table: toId});
+
+        callback({progress: 1});
+        await fs.writeFile(`${this.config.dataDir}/db/${from}_id.map`, JSON.stringify(idMap));
 
         bookId2RecId = null;
         utils.freeMemory();
@@ -624,6 +646,12 @@ class DbCreator {
             stats.filesDelCount = res.filesDelCount;
         }
 
+        //заодно добавим нужный индекс
+        await db.create({
+            in: 'book',
+            hash: {field: '_uid', type: 'string', depth: 100, unique: true},
+        });
+
         countDone = true;
     }
 }

server/core/DbSearcher.js

@@ -1,8 +1,7 @@
+const fs = require('fs-extra');
 //const _ = require('lodash');
-const LockQueue = require('./LockQueue');
 const utils = require('./utils');
 
-const maxMemCacheSize = 100;
 const maxLimit = 1000;
 
 const emptyFieldValue = '?';
@@ -14,9 +13,13 @@ const enruArr = (ruAlphabet + enAlphabet).split('');
 class DbSearcher {
     constructor(config, db) {
         this.config = config;
+        this.queryCacheMemSize = this.config.queryCacheMemSize;
+        this.queryCacheDiskSize = this.config.queryCacheDiskSize;
+        this.queryCacheEnabled = this.config.queryCacheEnabled
+            && (this.queryCacheMemSize > 0 || this.queryCacheDiskSize > 0);
+
         this.db = db;
 
-        this.lock = new LockQueue();
         this.searchFlag = 0;
         this.timer = null;
         this.closed = false;
@@ -25,17 +28,29 @@ class DbSearcher {
         this.bookIdMap = {};
 
         this.periodicCleanCache();//no await
-        this.fillBookIdMapAll();//no await
+    }
+
+    async init() {
+        await this.fillBookIdMap('author');
+        await this.fillBookIdMap('series');
+        await this.fillBookIdMap('title');
+        await this.fillDbConfig();
     }
 
     queryKey(q) {
-        return JSON.stringify([q.author, q.series, q.title, q.genre, q.lang, q.del, q.date, q.librate]);
+        const result = [];
+        for (const f of this.recStruct) {
+            result.push(q[f.field]);
+        }
+
+        return JSON.stringify(result);
     }
 
     getWhere(a) {
         const db = this.db;
 
-        a = a.toLowerCase();
+        if (a[0] !== '~')
+            a = a.toLowerCase();
         let where;
 
         //особая обработка префиксов
@@ -49,8 +64,18 @@ class DbSearcher {
             a = a.substring(1);
             where = `@indexIter('value', (v) => {
                 const enru = new Set(${db.esc(enruArr)});
-                return !v || (v !== ${db.esc(emptyFieldValue)} && !enru.has(v[0]) && v.indexOf(${db.esc(a)}) >= 0);
+                if (!v)
+                    return false;
+                return v !== ${db.esc(emptyFieldValue)} && !enru.has(v[0]) && v.indexOf(${db.esc(a)}) >= 0;
             })`;
+        } else if (a[0] == '~') {//RegExp
+            a = a.substring(1);
+            where = `
+                await (async() => {
+                    const re = new RegExp(${db.esc(a)}, 'i');
+                    @@indexIter('value', (v) => re.test(v) );
+                })()
+            `;
         } else {
             where = `@dirtyIndexLR('value', ${db.esc(a)}, ${db.esc(a + maxUtf8Char)})`;
         }
@@ -77,7 +102,7 @@ class DbSearcher {
                             result.add(bookId);
                     }
 
-                    return Array.from(result);
+                    return new Uint32Array(result);
                 `
             });
 
@@ -85,7 +110,7 @@ class DbSearcher {
         };
 
         //авторы
-        if (query.author && query.author !== '*') {
+        if (query.author) {
             const key = `book-ids-author-${query.author}`;
             let ids = await this.getCached(key);
 
@@ -99,7 +124,7 @@ class DbSearcher {
         }
 
         //серии
-        if (query.series && query.series !== '*') {
+        if (query.series) {
             const key = `book-ids-series-${query.series}`;
             let ids = await this.getCached(key);
 
@@ -113,7 +138,7 @@ class DbSearcher {
         }
 
         //названия
-        if (query.title && query.title !== '*') {
+        if (query.title) {
             const key = `book-ids-title-${query.title}`;
             let ids = await this.getCached(key);
 
@@ -151,7 +176,7 @@ class DbSearcher {
                                 result.add(bookId);
                         }
 
-                        return Array.from(result);
+                        return new Uint32Array(result);
                     `
                 });
 
@@ -187,7 +212,7 @@ class DbSearcher {
                                 result.add(bookId);
                         }
 
-                        return Array.from(result);
+                        return new Uint32Array(result);
                     `
                 });
 
@@ -199,12 +224,13 @@ class DbSearcher {
         }
 
         //удаленные
-        if (query.del !== undefined) {
-            const key = `book-ids-del-${query.del}`;
+        if (query.del) {
+            const del = parseInt(query.del, 10) || 0;
+            const key = `book-ids-del-${del}`;
             let ids = await this.getCached(key);
 
             if (ids === null) {
-                ids = await tableBookIds('del', `@indexLR('value', ${db.esc(query.del)}, ${db.esc(query.del)})`);
+                ids = await tableBookIds('del', `@indexLR('value', ${db.esc(del)}, ${db.esc(del)})`);
 
                 await this.putCached(key, ids);
             }
@@ -252,7 +278,7 @@ class DbSearcher {
                                 result.add(bookId);
                         }
 
-                        return Array.from(result);
+                        return new Uint32Array(result);
                     `
                 });
 
@@ -263,6 +289,42 @@ class DbSearcher {
             idsArr.push(ids);
         }
 
+        //тип файла
+        if (query.ext) {
+            const key = `book-ids-ext-${query.ext}`;
+            let ids = await this.getCached(key);
+
+            if (ids === null) {
+                const extRows = await db.select({
+                    table: 'ext',
+                    rawResult: true,
+                    where: `
+                        const exts = ${db.esc(query.ext.split('|'))};
+
+                        const ids = new Set();
+                        for (const l of exts) {
+                            for (const id of @indexLR('value', l, l))
+                                ids.add(id);
+                        }
+                        
+                        const result = new Set();
+                        for (const id of ids) {
+                            const row = @unsafeRow(id);
+                            for (const bookId of row.bookIds)
+                                result.add(bookId);
+                        }
+
+                        return new Uint32Array(result);
+                    `
+                });
+
+                ids = extRows[0].rawResult;
+                await this.putCached(key, ids);
+            }
+
+            idsArr.push(ids);
+        }
+
         if (idsArr.length > 1) {
             //ищем пересечение множеств
             let proc = 0;
@@ -285,7 +347,7 @@ class DbSearcher {
                 inter = newInter;
             }
 
-            return Array.from(inter);
+            return new Uint32Array(inter);
         } else if (idsArr.length == 1) {            
             return idsArr[0];
         } else {
@@ -293,53 +355,36 @@ class DbSearcher {
         }
     }
 
-    async fillBookIdMap(from) {
-        if (this.bookIdMap[from])
-            return this.bookIdMap[from];
-
-        await this.lock.get();
-        try {
-            const db = this.db;
-            const map = new Map();
-            const table = `${from}_id`;
-
-            await db.open({table});
-            let rows = await db.select({table});
-            await db.close({table});
+    async fillDbConfig() {
+        if (!this.dbConfig) {
+            const rows = await this.db.select({table: 'config'});
+            const config = {};
 
             for (const row of rows) {
-                if (!row.value.length)
-                    continue;
-
-                if (row.value.length > 1)
-                    map.set(row.id, row.value);
-                else
-                    map.set(row.id, row.value[0]);
+                config[row.id] = row.value;
             }
 
-            this.bookIdMap[from] = map;
-
-            rows = null;
-            await db.freeMemory();
-            utils.freeMemory();
-
-            return this.bookIdMap[from];
-        } finally {
-            this.lock.ret();
+            this.dbConfig = config;
+            this.recStruct = config.inpxInfo.recStruct;
         }
     }
 
-    async fillBookIdMapAll() {
-        await this.fillBookIdMap('author');
-        await this.fillBookIdMap('series');
-        await this.fillBookIdMap('title');
+    async fillBookIdMap(from) {
+        const data = await fs.readFile(`${this.config.dataDir}/db/${from}_id.map`, 'utf-8');
+
+        const idMap = JSON.parse(data);
+        idMap.arr = new Uint32Array(idMap.arr);
+        idMap.map = new Map(idMap.map);
+
+        this.bookIdMap[from] = idMap;
     }
 
-    async filterTableIds(tableIds, from, query) {
-        let result = tableIds;
-
-        //т.к. авторы у книги идут списком, то дополнительно фильтруем
-        if (from == 'author' && query.author && query.author !== '*') {
+    async tableIdsFilter(from, query) {
+        //т.к. авторы у книги идут списком (т.е. одна книга относиться сразу к нескольким авторам),
+        //то в выборку по bookId могут попасть авторы, которые отсутствуют в критерии query.author,
+        //поэтому дополнительно фильтруем
+        let result = null;
+        if (from == 'author' && query.author) {
             const key = `filter-ids-author-${query.author}`;
             let authorIds = await this.getCached(key);
 
@@ -347,7 +392,7 @@ class DbSearcher {
                 const rows = await this.db.select({
                     table: 'author',
                     rawResult: true,
-                    where: `return Array.from(${this.getWhere(query.author)})`
+                    where: `return new Uint32Array(${this.getWhere(query.author)})`
                 });
 
                 authorIds = rows[0].rawResult;
@@ -355,12 +400,7 @@ class DbSearcher {
                 await this.putCached(key, authorIds);
             }
 
-            //пересечение tableIds и authorIds
-            result = [];
-            const authorIdsSet = new Set(authorIds);
-            for (const id of tableIds)
-                if (authorIdsSet.has(id))
-                    result.push(id);
+            result = new Set(authorIds);
         }
 
         return result;
@@ -381,24 +421,30 @@ class DbSearcher {
                 await this.putCached(bookKey, bookIds);
             }
 
+            //id книг (bookIds) нашли, теперь надо их смаппировать в id таблицы from (авторов, серий, названий)
             if (bookIds) {
+                //т.к. авторы у книги идут списком, то дополнительно фильтруем
+                const filter = await this.tableIdsFilter(from, query);
+
                 const tableIdsSet = new Set();
-                const bookIdMap = await this.fillBookIdMap(from);
+                const idMap = this.bookIdMap[from];
                 let proc = 0;
                 let nextProc = 0;
                 for (const bookId of bookIds) {
-                    const tableIdValue = bookIdMap.get(bookId);
-                    if (!tableIdValue)
-                        continue;
-
-                    if (Array.isArray(tableIdValue)) {
-                        for (const tableId of tableIdValue) {
+                    const tableId = idMap.arr[bookId];
+                    if (tableId) {
+                        if (!filter || filter.has(tableId))
                             tableIdsSet.add(tableId);
-                            proc++;
-                        }
-                    } else {
-                        tableIdsSet.add(tableIdValue);
                         proc++;
+                    } else {
+                        const tableIdArr = idMap.map.get(bookId);
+                        if (tableIdArr) {
+                            for (const tableId of tableIdArr) {
+                            if (!filter || filter.has(tableId))
+                                    tableIdsSet.add(tableId);
+                                proc++;
+                            }
+                        }
                     }
 
                     //прерываемся иногда, чтобы не блокировать Event Loop
@@ -408,19 +454,19 @@ class DbSearcher {
                     }
                 }
 
-                tableIds = Array.from(tableIdsSet);
-            } else {
+                tableIds = new Uint32Array(tableIdsSet);
+            } else {//bookIds пустой - критерии не заданы, значит берем все id из from
                 const rows = await db.select({
                     table: from,
                     rawResult: true,
-                    where: `return Array.from(@all())`
+                    where: `return new Uint32Array(@all())`
                 });
 
                 tableIds = rows[0].rawResult;
             }
 
-            tableIds = await this.filterTableIds(tableIds, from, query);
-
+            //сортируем по id
+            //порядок id соответствует ASC-сортировке по строковому значению из from (имя автора, назание серии, название книги)
             tableIds.sort((a, b) => a - b);
 
             await this.putCached(tableKey, tableIds);
@@ -509,11 +555,13 @@ class DbSearcher {
             limit = (limit > maxLimit ? maxLimit : limit);
             const offset = (query.offset ? query.offset : 0);
 
+            const slice = ids.slice(offset, offset + limit);
+
             //выборка найденных значений
             const found = await db.select({
                 table: from,
                 map: `(r) => ({id: r.id, ${from}: r.name, bookCount: r.bookCount, bookDelCount: r.bookDelCount})`,
-                where: `@@id(${db.esc(ids.slice(offset, offset + limit))})`
+                where: `@@id(${db.esc(Array.from(slice))})`
             });
 
             //для title восстановим books
@@ -537,28 +585,292 @@ class DbSearcher {
         }
     }
 
-    async getAuthorBookList(authorId) {
+    async bookSearchIds(query) {
+        const queryKey = this.queryKey(query);
+        const bookKey = `book-search-ids-${queryKey}`;
+        let bookIds = await this.getCached(bookKey);
+
+        if (bookIds === null) {
+            const db = this.db;
+            const filterBySearch = (bookField, searchValue) => {
+                searchValue = searchValue.toLowerCase();
+                //особая обработка префиксов
+                if (searchValue == emptyFieldValue) {
+                    return `(row.${bookField} === '' || row.${bookField}.indexOf(${db.esc(emptyFieldValue)}) === 0)`;
+                } else if (searchValue[0] == '=') {
+
+                    searchValue = searchValue.substring(1);
+                    return `(row.${bookField}.toLowerCase().localeCompare(${db.esc(searchValue)}) === 0)`;
+                } else if (searchValue[0] == '*') {
+
+                    searchValue = searchValue.substring(1);
+                    return `(row.${bookField} && row.${bookField}.toLowerCase().indexOf(${db.esc(searchValue)}) >= 0)`;
+                } else if (searchValue[0] == '#') {
+
+                    searchValue = searchValue.substring(1);
+                    return `(row.${bookField} === '' || (!enru.has(row.${bookField}.toLowerCase()[0]) && row.${bookField}.toLowerCase().indexOf(${db.esc(searchValue)}) >= 0))`;
+                } else if (searchValue[0] == '~') {//RegExp
+                    searchValue = searchValue.substring(1);
+
+                    return `
+                        (() => {
+                            const re = new RegExp(${db.esc(searchValue)}, 'i');
+                            return re.test(row.${bookField});
+                        })()
+                    `;
+                } else {
+
+                    return `(row.${bookField}.toLowerCase().localeCompare(${db.esc(searchValue)}) >= 0 ` +
+                        `&& row.${bookField}.toLowerCase().localeCompare(${db.esc(searchValue)} + ${db.esc(maxUtf8Char)}) <= 0)`;
+                }
+            };
+
+            const checks = ['true'];
+            for (const f of this.recStruct) {
+                if (query[f.field]) {
+                    let searchValue = query[f.field];
+                    if (f.type === 'S') {
+                        checks.push(filterBySearch(f.field, searchValue));
+                    } if (f.type === 'N') {
+                        const v = searchValue.split('..');
+
+                        if (v.length == 1) {
+                            searchValue = parseInt(searchValue, 10);
+                            if (isNaN(searchValue))
+                                throw new Error(`Wrong query param, ${f.field}=${searchValue}`);
+
+                            checks.push(`row.${f.field} === ${searchValue}`);
+                        } else {
+                            const from = parseInt(v[0] || '0', 10);
+                            const to = parseInt(v[1] || '0', 10);
+                            if (isNaN(from) || isNaN(to))
+                                throw new Error(`Wrong query param, ${f.field}=${searchValue}`);
+
+                            checks.push(`row.${f.field} >= ${from} && row.${f.field} <= ${to}`);
+                        }
+                    }
+                }
+            }
+
+            const rows = await db.select({
+                table: 'book',
+                rawResult: true,
+                where: `
+                    const enru = new Set(${db.esc(enruArr)});
+
+                    const checkBook = (row) => {
+                        return ${checks.join(' && ')};
+                    };
+
+                    const result = [];
+                    for (const id of @all()) {
+                        const row = @unsafeRow(id);
+                        if (checkBook(row))
+                            result.push(row);
+                    }
+
+                    result.sort((a, b) => {
+                        let cmp = a.author.localeCompare(b.author);
+                        if (cmp === 0 && (a.series || b.series)) {
+                            cmp = (a.series && b.series ? a.series.localeCompare(b.series) : (a.series ? -1 : 1));
+                        }
+                        if (cmp === 0)
+                            cmp = a.serno - b.serno;
+                        if (cmp === 0)
+                            cmp = a.title.localeCompare(b.title);
+
+                        return cmp;
+                    });
+
+                    return new Uint32Array(result.map(row => row.id));
+                `
+            });
+
+            bookIds = rows[0].rawResult;
+    
+            await this.putCached(bookKey, bookIds);
+        }
+
+        return bookIds;
+    }
+
+    //неоптимизированный поиск по всем книгам, по всем полям
+    async bookSearch(query) {
         if (this.closed)
             throw new Error('DbSearcher closed');
 
-        if (!authorId)
-            return {author: '', books: ''};
-
         this.searchFlag++;
 
         try {
-            //выборка книг автора по authorId
-            const rows = await this.restoreBooks('author', [authorId])
+            const db = this.db;
 
-            let author = '';
-            let books = '';
+            const ids = await this.bookSearchIds(query);
+
+            const totalFound = ids.length;            
+            let limit = (query.limit ? query.limit : 100);
+            limit = (limit > maxLimit ? maxLimit : limit);
+            const offset = (query.offset ? query.offset : 0);
+
+            const slice = ids.slice(offset, offset + limit);
+
+            //выборка найденных значений
+            const found = await db.select({
+                table: 'book',
+                where: `@@id(${db.esc(Array.from(slice))})`
+            });
+
+            return {found, totalFound};
+        } finally {
+            this.searchFlag--;
+        }
+    }
+
+    async opdsQuery(from, query) {
+        if (this.closed)
+            throw new Error('DbSearcher closed');
+
+        if (!['author', 'series', 'title'].includes(from))
+            throw new Error(`Unknown value for param 'from'`);
+
+        this.searchFlag++;
+
+        try {
+            const db = this.db;
+
+            const depth = query.depth || 1;
+            const queryKey = this.queryKey(query);
+            const opdsKey = `${from}-opds-d${depth}-${queryKey}`;
+            let result = await this.getCached(opdsKey);
+
+            if (result === null) {
+                const ids = await this.selectTableIds(from, query);
+
+                const totalFound = ids.length;
+
+                //группировка по name длиной depth
+                const found = await db.select({
+                    table: from,
+                    rawResult: true,
+                    where: `
+                        const depth = ${db.esc(depth)};
+                        const group = new Map();
+
+                        const ids = ${db.esc(Array.from(ids))};
+                        for (const id of ids) {
+                            const row = @unsafeRow(id);
+                            const s = row.value.substring(0, depth);
+                            let g = group.get(s);
+                            if (!g) {
+                                g = {id: row.id, name: row.name, value: s, count: 0, bookCount: 0};
+                                group.set(s, g);
+                            }
+                            g.count++;
+                            g.bookCount += row.bookCount;
+                        }
+
+                        const result = Array.from(group.values());
+                        result.sort((a, b) => a.value.localeCompare(b.value));
+
+                        return result;
+                    `
+                });
+
+                result = {found: found[0].rawResult, totalFound};
+                
+                await this.putCached(opdsKey, result);
+            }
+
+            return result;
+        } finally {
+            this.searchFlag--;
+        }
+    }
+
+    async getAuthorBookList(authorId, author) {
+        if (this.closed)
+            throw new Error('DbSearcher closed');
+
+        if (!authorId && !author)
+            return {author: '', books: []};
+
+        this.searchFlag++;
+
+        try {
+            const db = this.db;
+
+            if (!authorId) {                
+                //восстановим authorId
+                authorId = 0;
+                author = author.toLowerCase();
+
+                const rows = await db.select({
+                    table: 'author',
+                    rawResult: true,
+                    where: `return Array.from(@dirtyIndexLR('value', ${db.esc(author)}, ${db.esc(author)}))`
+                });
+
+                if (rows.length && rows[0].rawResult.length)
+                    authorId = rows[0].rawResult[0];
+            }
+
+            //выборка книг автора по authorId
+            const rows = await this.restoreBooks('author', [authorId]);
+
+            let authorName = '';
+            let books = [];
 
             if (rows.length) {
-                author = rows[0].name;
+                authorName = rows[0].name;
                 books = rows[0].books;
             }
 
-            return {author, books: (books && books.length ? JSON.stringify(books) : '')};
+            return {author: authorName, books};
+        } finally {
+            this.searchFlag--;
+        }
+    }
+
+    async getAuthorSeriesList(authorId) {
+        if (this.closed)
+            throw new Error('DbSearcher closed');
+
+        if (!authorId)
+            return {author: '', series: []};
+
+        this.searchFlag++;
+
+        try {
+            const db = this.db;
+
+            //выборка книг автора по authorId
+            const bookList = await this.getAuthorBookList(authorId);
+            const books = bookList.books;
+            const seriesSet = new Set();
+            for (const book of books) {
+                if (book.series)
+                    seriesSet.add(book.series.toLowerCase());
+            }
+
+            let series = [];
+            if (seriesSet.size) {
+                //выборка серий по названиям
+                series = await db.select({
+                    table: 'series',
+                    map: `(r) => ({id: r.id, series: r.name, bookCount: r.bookCount, bookDelCount: r.bookDelCount})`,
+                    where: `
+                        const seriesArr = ${db.esc(Array.from(seriesSet))};
+                        const ids = new Set();
+                        for (const value of seriesArr) {
+                            for (const id of @dirtyIndexLR('value', value, value))
+                                ids.add(id);
+                        }
+
+                        return ids;
+                    `
+                });
+            }
+
+            return {author: bookList.author, series};
         } finally {
             this.searchFlag--;
         }
@@ -569,7 +881,7 @@ class DbSearcher {
             throw new Error('DbSearcher closed');
 
         if (!series)
-            return {books: ''};
+            return {books: []};
 
         this.searchFlag++;
 
@@ -585,7 +897,7 @@ class DbSearcher {
                 where: `return Array.from(@dirtyIndexLR('value', ${db.esc(series)}, ${db.esc(series)}))`
             });
 
-            let books;
+            let books = [];
             if (rows.length && rows[0].rawResult.length) {
                 //выборка книг серии
                 const bookRows = await this.restoreBooks('series', [rows[0].rawResult[0]])
@@ -594,14 +906,14 @@ class DbSearcher {
                     books = bookRows[0].books;
             }
 
-            return {books: (books && books.length ? JSON.stringify(books) : '')};
+            return {books};
         } finally {
             this.searchFlag--;
         }
     }
 
     async getCached(key) {
-        if (!this.config.queryCacheEnabled)
+        if (!this.queryCacheEnabled)
             return null;
 
         let result = null;
@@ -609,13 +921,13 @@ class DbSearcher {
         const db = this.db;
         const memCache = this.memCache;
 
-        if (memCache.has(key)) {//есть в недавних
+        if (this.queryCacheMemSize > 0 && memCache.has(key)) {//есть в недавних
             result = memCache.get(key);
 
             //изменим порядок ключей, для последующей правильной чистки старых
             memCache.delete(key);
             memCache.set(key, result);
-        } else {//смотрим в таблице
+        } else if (this.queryCacheDiskSize > 0) {//смотрим в таблице
             const rows = await db.select({table: 'query_cache', where: `@@id(${db.esc(key)})`});
 
             if (rows.length) {//нашли в кеше
@@ -626,13 +938,17 @@ class DbSearcher {
                 });
 
                 result = rows[0].value;
-                memCache.set(key, result);
 
-                if (memCache.size > maxMemCacheSize) {
-                    //удаляем самый старый ключ-значение
-                    for (const k of memCache.keys()) {
-                        memCache.delete(k);
-                        break;
+                //заполняем кеш в памяти
+                if (this.queryCacheMemSize > 0) {
+                    memCache.set(key, result);
+
+                    if (memCache.size > this.queryCacheMemSize) {
+                        //удаляем самый старый ключ-значение
+                        for (const k of memCache.keys()) {
+                            memCache.delete(k);
+                            break;
+                        }
                     }
                 }
             }
@@ -642,40 +958,44 @@ class DbSearcher {
     }
 
     async putCached(key, value) {
-        if (!this.config.queryCacheEnabled)
+        if (!this.queryCacheEnabled)
             return;
 
         const db = this.db;
 
-        const memCache = this.memCache;
-        memCache.set(key, value);
+        if (this.queryCacheMemSize > 0) {
+            const memCache = this.memCache;
+            memCache.set(key, value);
 
-        if (memCache.size > maxMemCacheSize) {
-            //удаляем самый старый ключ-значение
-            for (const k of memCache.keys()) {
-                memCache.delete(k);
-                break;
+            if (memCache.size > this.queryCacheMemSize) {
+                //удаляем самый старый ключ-значение
+                for (const k of memCache.keys()) {
+                    memCache.delete(k);
+                    break;
+                }
             }
         }
 
-        //кладем в таблицу асинхронно
-        (async() => {
-            try {
-                await db.insert({
-                    table: 'query_cache',
-                    replace: true,
-                    rows: [{id: key, value}],
-                });
+        if (this.queryCacheDiskSize > 0) {
+            //кладем в таблицу асинхронно
+            (async() => {
+                try {
+                    await db.insert({
+                        table: 'query_cache',
+                        replace: true,
+                        rows: [{id: key, value}],
+                    });
 
-                await db.insert({
-                    table: 'query_time',
-                    replace: true,
-                    rows: [{id: key, time: Date.now()}],
-                });
-            } catch(e) {
-                console.error(`putCached: ${e.message}`);
-            }
-        })();
+                    await db.insert({
+                        table: 'query_time',
+                        replace: true,
+                        rows: [{id: key, time: Date.now()}],
+                    });
+                } catch(e) {
+                    console.error(`putCached: ${e.message}`);
+                }
+            })();
+        }
     }
 
     async periodicCleanCache() {
@@ -685,21 +1005,37 @@ class DbSearcher {
             return;
 
         try {
+            if (!this.queryCacheEnabled || this.queryCacheDiskSize <= 0)
+                return;
+
             const db = this.db;
 
-            const oldThres = Date.now() - cleanInterval;
+            let rows = await db.select({table: 'query_time', count: true});
+            const delCount = rows[0].count - this.queryCacheDiskSize;
 
-            //выберем всех кандидатов на удаление
-            const rows = await db.select({
+            if (delCount < 1)
+                return;
+
+            //выберем delCount кандидатов на удаление
+            rows = await db.select({
                 table: 'query_time',
+                rawResult: true,
                 where: `
-                    @@iter(@all(), (r) => (r.time < ${db.esc(oldThres)}));
+                    const delCount = ${delCount};
+                    const rows = [];
+
+                    @unsafeIter(@all(), (r) => {
+                        rows.push(r);
+                        return false;
+                    });
+
+                    rows.sort((a, b) => a.time - b.time);
+
+                    return rows.slice(0, delCount).map(r => r.id);
                 `
             });
 
-            const ids = [];
-            for (const row of rows)
-                ids.push(row.id);
+            const ids = rows[0].rawResult;
 
             //удаляем
             await db.delete({table: 'query_cache', where: `@@id(${db.esc(ids)})`});

server/core/FileDownloader.js

@@ -14,6 +14,7 @@ class FileDownloader {
 
         let options = {
             headers: {
+                'accept-encoding': 'gzip, compress, deflate',
                 'user-agent': userAgent,
                 timeout: 300*1000,
             },

server/core/InpxParser.js

@@ -1,11 +1,32 @@
 const path = require('path');
+const crypto = require('crypto');
 const ZipReader = require('./ZipReader');
+const utils = require('./utils');
 
 const collectionInfo = 'collection.info';
 const structureInfo = 'structure.info';
 const versionInfo = 'version.info';
 
 const defaultStructure = 'AUTHOR;GENRE;TITLE;SERIES;SERNO;FILE;SIZE;LIBID;DEL;EXT;DATE;LANG;LIBRATE;KEYWORDS';
+//'AUTHOR;GENRE;TITLE;SERIES;SERNO;FILE;SIZE;LIBID;DEL;EXT;DATE;INSNO;FOLDER;LANG;LIBRATE;KEYWORDS;'
+const recStructType = {
+    author: 'S',
+    genre: 'S',
+    title: 'S',
+    series: 'S',
+    serno: 'N',
+    file: 'S',
+    size: 'N',
+    libid: 'S',
+    del: 'N',
+    ext: 'S',
+    date: 'S',
+    insno: 'N',
+    folder: 'S',
+    lang: 'S',
+    librate: 'N',
+    keywords: 'S',
+}
 
 class InpxParser {
     constructor() {
@@ -23,6 +44,21 @@ class InpxParser {
         return result;
     }
 
+    getRecStruct(structure) {
+        const result = [];
+        let struct = structure;
+        //folder есть всегда
+        if (!struct.includes('folder'))
+            struct = struct.concat(['folder']);
+
+        for (const field of struct) {
+            if (utils.hasProp(recStructType, field))
+                result.push({field, type: recStructType[field]});
+        }
+
+        return result;
+    }
+
     async parse(inpxFile, readFileCallback, parsedCallback) {
         if (!readFileCallback)
             readFileCallback = async() => {};
@@ -60,19 +96,18 @@ class InpxParser {
             info.version = await this.safeExtractToString(zipReader, versionInfo);
 
             //структура
-            let inpxStructure = info.structure;
-            if (!inpxStructure)
-                inpxStructure = defaultStructure;
-            inpxStructure = inpxStructure.toLowerCase();
-            const structure = inpxStructure.split(';');
+            if (!info.structure)
+                info.structure = defaultStructure;
+            const structure = info.structure.toLowerCase().split(';');
+
+            info.recStruct = this.getRecStruct(structure);
 
             //парсим inp-файлы
             this.chunk = [];
             for (const inpFile of inpFiles) {
                 await readFileCallback({fileName: inpFile, current: ++current});
-                const buf = await zipReader.extractToBuf(inpFile);
                 
-                await this.parseInp(buf, structure, parsedCallback);
+                await this.parseInp(zipReader, inpFile, structure, parsedCallback);
             }
 
             if (this.chunk.length) {
@@ -84,10 +119,13 @@ class InpxParser {
         }
     }
 
-    async parseInp(inpBuf, structure, parsedCallback) {
-        const structLen = structure.length;
+    async parseInp(zipReader, inpFile, structure, parsedCallback) {
+        const inpBuf = await zipReader.extractToBuf(inpFile);
         const rows = inpBuf.toString().split('\n');
 
+        const defaultFolder = `${path.basename(inpFile, '.inp')}.zip`;
+        const structLen = structure.length;
+
         for (const row of rows) {
             let line = row;
             if (!line)
@@ -96,9 +134,13 @@ class InpxParser {
             if (line[line.length - 1] == '\x0D')
                 line = line.substring(0, line.length - 1);
 
+            const rec = {};
+            //уникальный идентификатор записи
+            const sha256 = crypto.createHash('sha256');
+            rec._uid = sha256.update(line).digest('base64');
+
             //парсим запись
             const parts = line.split('\x04');
-            const rec = {};
 
             const len = (parts.length > structLen ? structLen : parts.length);
             for (let i = 0; i < len; i++) {
@@ -115,6 +157,9 @@ class InpxParser {
                 rec.genre = rec.genre.split(':').filter(s => s).join(',');
             }
 
+            if (!rec.folder)
+                rec.folder = defaultFolder;
+
             rec.serno = parseInt(rec.serno, 10) || 0;
             rec.size = parseInt(rec.size, 10) || 0;
             rec.del = parseInt(rec.del, 10) || 0;

server/core/RemoteLib.js

@@ -16,8 +16,6 @@ class RemoteLib {
             this.config = config;
 
             this.wsc = new WebSocketConnection(config.remoteLib.url, 10, 30, {rejectUnauthorized: false});
-            if (config.remoteLib.accessPassword)
-                this.accessToken = utils.getBufHash(config.remoteLib.accessPassword, 'sha256', 'hex');
 
             this.remoteHost = config.remoteLib.url.replace(/^ws:\/\//, 'http://').replace(/^wss:\/\//, 'https://');
 
@@ -31,7 +29,7 @@ class RemoteLib {
         return instance;
     }
 
-    async wsRequest(query) {
+    async wsRequest(query, recurse = false) {
         if (this.accessToken)
             query.accessToken = this.accessToken;
 
@@ -40,6 +38,11 @@ class RemoteLib {
             120
         );
 
+        if (!recurse && response && response.error == 'need_access_token' && this.config.remoteLib.accessPassword) {
+            this.accessToken = utils.getBufHash(this.config.remoteLib.accessPassword + response.salt, 'sha256', 'hex');
+            return await this.wsRequest(query, true);
+        }
+
         if (response.error)
             throw new Error(response.error);
 
@@ -58,14 +61,15 @@ class RemoteLib {
         }
     }
 
-    async downloadBook(bookPath, downFileName) {
+    async downloadBook(bookUid) {
         try {
-            const response = await await this.wsRequest({action: 'get-book-link', bookPath, downFileName});
+            const response = await await this.wsRequest({action: 'get-book-link', bookUid});
             const link = response.link;
 
             const buf = await this.down.load(`${this.remoteHost}${link}`, {decompress: false});
 
-            const publicPath = `${this.config.publicFilesDir}${link}`;
+            const hash = path.basename(link);
+            const publicPath = `${this.config.bookDir}/${hash}`;
             
             await fs.writeFile(publicPath, buf);
 

server/core/WebAccess.js

@@ -0,0 +1,154 @@
+const { JembaDbThread } = require('jembadb');
+const utils = require('../core/utils');
+const log = new (require('../core/AppLogger'))().log;//singleton
+const asyncExit = new (require('./AsyncExit'))();
+
+const cleanPeriod = 1*60*1000;//1 минута
+const cleanUnusedTokenTimeout = 5*60*1000;//5 минут
+
+class WebAccess {
+    constructor(config) {
+        this.config = config;
+
+        this.freeAccess = (config.accessPassword === '');
+        this.accessTimeout = config.accessTimeout*60*1000;
+        this.accessMap = new Map();
+
+        asyncExit.add(this.closeDb.bind(this));
+
+        setTimeout(() => { this.periodicClean(); }, cleanPeriod);
+    }
+
+    async init() {
+        const config = this.config;
+        const dbPath = `${config.dataDir}/web-access`;
+        const db = new JembaDbThread();//в отдельном потоке
+        await db.lock({
+            dbPath,
+            create: true,
+            softLock: true,
+
+            tableDefaults: {
+                cacheSize: config.dbCacheSize,
+            },
+        });
+
+        try {
+            //открываем таблицы
+            await db.openAll();
+        } catch(e) {
+            if (
+                e.message.indexOf('corrupted') >= 0 
+                || e.message.indexOf('Unexpected token') >= 0
+                || e.message.indexOf('invalid stored block lengths') >= 0
+            ) {
+                log(LM_ERR, `DB ${dbPath} corrupted`);
+                log(`Open "${dbPath}" with auto repair`);
+                await db.openAll({autoRepair: true});
+            } else {
+                throw e;
+            }
+        }
+
+        await db.create({table: 'access', quietIfExists: true});
+        //проверим, нужно ли обнулить таблицу access
+        const pass = utils.getBufHash(this.config.accessPassword, 'sha256', 'hex');
+        await db.create({table: 'config', quietIfExists: true});
+        let rows = await db.select({table: 'config', where: `@@id('pass')`});
+
+        if (!rows.length || rows[0].value !== pass) {
+            //пароль сменился в конфиге, обнуляем токены
+            await db.truncate({table: 'access'});
+            await db.insert({table: 'config', replace: true, rows: [{id: 'pass', value: pass}]});
+        }
+
+        //загрузим токены сессий
+        rows = await db.select({table: 'access'});
+        for (const row of rows)
+            this.accessMap.set(row.id, row.value);
+
+        this.db = db;
+    }
+
+    async closeDb() {
+        if (this.db) {
+            await this.db.unlock();
+            this.db = null;
+        }
+    }
+
+    async periodicClean() {
+        while (1) {//eslint-disable-line no-constant-condition
+            try {
+                const now = Date.now();
+
+                //почистим accessMap
+                if (!this.freeAccess) {
+                    for (const [accessToken, accessRec] of this.accessMap) {
+                        if (   !(accessRec.used > 0 || now - accessRec.time < cleanUnusedTokenTimeout)
+                            || !(this.accessTimeout === 0 || now - accessRec.time < this.accessTimeout)
+                            ) {
+                            await this.deleteAccess(accessToken);
+                        } else if (!accessRec.saved) {
+                            await this.saveAccess(accessToken);
+                        }
+                    }
+                }
+
+            } catch(e) {
+                log(LM_ERR, `WebAccess.periodicClean error: ${e.message}`);
+            }
+            
+            await utils.sleep(cleanPeriod);
+        }
+    }
+
+    async hasAccess(accessToken) {
+        if (this.freeAccess)
+            return true;
+
+        const accessRec = this.accessMap.get(accessToken);
+        if (accessRec) {
+            const now = Date.now();
+
+            if (this.accessTimeout === 0 || now - accessRec.time < this.accessTimeout) {
+                accessRec.used++;
+                accessRec.time = now;
+                accessRec.saved = false;
+                if (accessRec.used === 1)
+                    await this.saveAccess(accessToken);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    async deleteAccess(accessToken) {
+        await this.db.delete({table: 'access', where: `@@id(${this.db.esc(accessToken)})`});
+        this.accessMap.delete(accessToken);
+    }
+
+    async saveAccess(accessToken) {
+        const value = this.accessMap.get(accessToken);
+        if (!value || value.saved)
+            return;
+
+        value.saved = true;
+        await this.db.insert({
+            table: 'access',
+            replace: true,
+            rows: [{id: accessToken, value}]
+        });
+    }
+
+    newToken() {
+        const salt = utils.randomHexString(32);
+        const accessToken = utils.getBufHash(this.config.accessPassword + salt, 'sha256', 'hex');
+        this.accessMap.set(accessToken, {time: Date.now(), used: 0});
+
+        return salt;
+    }
+}
+
+module.exports = WebAccess;

server/core/WebWorker.js

@@ -10,11 +10,13 @@ const DbCreator = require('./DbCreator');
 const DbSearcher = require('./DbSearcher');
 const InpxHashCreator = require('./InpxHashCreator');
 const RemoteLib = require('./RemoteLib');//singleton
+const FileDownloader = require('./FileDownloader');
 
-const ayncExit = new (require('./AsyncExit'))();
+const asyncExit = new (require('./AsyncExit'))();
 const log = new (require('./AppLogger'))().log;//singleton
 const utils = require('./utils');
 const genreTree = require('./genres');
+const Fb2Helper = require('./fb2/Fb2Helper');
 
 //server states
 const ssNormal = 'normal';
@@ -27,7 +29,8 @@ const stateToText = {
     [ssDbCreating]: 'Создание поисковой базы',
 };
 
-const cleanDirPeriod = 60*60*1000;//каждый час
+const cleanDirInterval = 60*60*1000;//каждый час
+const checkReleaseInterval = 7*60*60*1000;//каждые 7 часов
 
 //singleton
 let instance = null;
@@ -44,6 +47,7 @@ class WebWorker {
             }
             
             this.inpxHashCreator = new InpxHashCreator(config);
+            this.fb2Helper = new Fb2Helper();
             this.inpxFileHash = '';
 
             this.wState = this.workerState.getControl('server_state');
@@ -51,20 +55,21 @@ class WebWorker {
             this.db = null;
             this.dbSearcher = null;
 
-            ayncExit.add(this.closeDb.bind(this));
+            asyncExit.add(this.closeDb.bind(this));
 
             this.loadOrCreateDb();//no await
             this.periodicLogServerStats();//no await
 
             const dirConfig = [
                 {
-                    dir: config.filesDir,
+                    dir: config.bookDir,
                     maxSize: config.maxFilesDirSize,
                 },
             ];
 
             this.periodicCleanDir(dirConfig);//no await
             this.periodicCheckInpx();//no await
+            this.periodicCheckNewRelease();//no await
 
             instance = this;
         }
@@ -208,6 +213,7 @@ class WebWorker {
 
             //поисковый движок
             this.dbSearcher = new DbSearcher(config, db);
+            await this.dbSearcher.init();
 
             //stuff
             db.wwCache = {};            
@@ -219,7 +225,7 @@ class WebWorker {
             this.logServerStats();
         } catch (e) {
             log(LM_FATAL, e.message);            
-            ayncExit.exit(1);
+            asyncExit.exit(1);
         }
     }
 
@@ -265,10 +271,33 @@ class WebWorker {
         return result;
     }
 
-    async getAuthorBookList(authorId) {
+    async bookSearch(query) {
         this.checkMyState();
 
-        return await this.dbSearcher.getAuthorBookList(authorId);
+        const result = await this.dbSearcher.bookSearch(query);
+
+        const config = await this.dbConfig();
+        result.inpxHash = (config.inpxHash ? config.inpxHash : '');
+
+        return result;
+    }
+
+    async opdsQuery(from, query) {
+        this.checkMyState();
+
+        return await this.dbSearcher.opdsQuery(from, query);
+    }
+
+    async getAuthorBookList(authorId, author) {
+        this.checkMyState();
+
+        return await this.dbSearcher.getAuthorBookList(authorId, author);
+    }
+
+    async getAuthorSeriesList(authorId) {
+        this.checkMyState();
+
+        return await this.dbSearcher.getAuthorSeriesList(authorId);
     }
 
     async getSeriesBookList(series) {
@@ -321,9 +350,14 @@ class WebWorker {
             rows = await db.select({table: 'lang', map: `(r) => ({value: r.value})`});
             const langs = rows.map(r => r.value);            
 
+            // exts
+            rows = await db.select({table: 'ext', map: `(r) => ({value: r.value})`});
+            const exts = rows.map(r => r.value);            
+
             result = {
                 genreTree: genres,
                 langList: langs,
+                extList: exts,
                 inpxHash: (config.inpxHash ? config.inpxHash : ''),
             };
 
@@ -338,21 +372,32 @@ class WebWorker {
     async extractBook(bookPath) {
         const outFile = `${this.config.tempDir}/${utils.randomHexString(30)}`;
 
-        const folder = `${this.config.libDir}/${path.dirname(bookPath)}`;
-        const file = path.basename(bookPath);
+        bookPath = bookPath.replace(/\\/g, '/').replace(/\/\//g, '/');
 
-        const zipReader = new ZipReader();
-        await zipReader.open(folder);
+        const i = bookPath.indexOf('/');
+        const folder = `${this.config.libDir}/${(i >= 0 ? bookPath.substring(0, i) : bookPath )}`;
+        const file = (i >= 0 ? bookPath.substring(i + 1) : '' );
 
-        try {
-            await zipReader.extractToFile(file, outFile);
+        const fullPath = `${folder}/${file}`;
+
+        if (!file || await fs.pathExists(fullPath)) {// файл есть на диске
+            
+            await fs.copy(fullPath, outFile);
             return outFile;
-        } finally {
-            await zipReader.close();
+        } else {// файл в zip-архиве
+            const zipReader = new ZipReader();
+            await zipReader.open(folder);
+
+            try {
+                await zipReader.extractToFile(file, outFile);
+                return outFile;
+            } finally {
+                await zipReader.close();
+            }
         }
     }
 
-    async restoreBook(bookPath, downFileName) {
+    async restoreBook(bookUid, bookPath, downFileName) {
         const db = this.db;
 
         let extractedFile = '';
@@ -362,12 +407,12 @@ class WebWorker {
             extractedFile = await this.extractBook(bookPath);
             hash = await utils.getFileHash(extractedFile, 'sha256', 'hex');
         } else {
-            hash = await this.remoteLib.downloadBook(bookPath, downFileName);
+            hash = await this.remoteLib.downloadBook(bookUid);
         }
 
-        const link = `${this.config.filesPathStatic}/${hash}`;
-        const bookFile = `${this.config.filesDir}/${hash}`;
-        const bookFileDesc = `${bookFile}.json`;
+        const link = `${this.config.bookPathStatic}/${hash}`;
+        const bookFile = `${this.config.bookDir}/${hash}`;
+        const bookFileDesc = `${bookFile}.d.json`;
 
         if (!await fs.pathExists(bookFile) || !await fs.pathExists(bookFileDesc)) {
             if (!await fs.pathExists(bookFile) && extractedFile) {
@@ -400,35 +445,62 @@ class WebWorker {
         return link;
     }
 
-    async getBookLink(params) {
+    async getBookLink(bookUid) {
         this.checkMyState();
 
-        const {bookPath, downFileName} = params;
-
         try {
             const db = this.db;
             let link = '';
 
+            //найдем downFileName и bookPath
+            let rows = await db.select({table: 'book', where: `@@hash('_uid', ${db.esc(bookUid)})`});
+            if (!rows.length)
+                throw new Error('404 Файл не найден');
+
+            const book = rows[0];
+            let downFileName = book.file;
+            const authors = book.author.split(',');
+            let author = authors[0];
+            author = author.split(' ').filter(r => r.trim());
+            for (let i = 1; i < author.length; i++)
+                author[i] = `${(i === 1 ? ' ' : '')}${author[i][0]}.`;
+            if (authors.length > 1)
+                author.push(' и др.');
+
+            const at = [author.join(''), (book.title ? `_${book.title}` : '')];
+            downFileName = utils.makeValidFileNameOrEmpty(at.filter(r => r).join(''))
+                || utils.makeValidFileNameOrEmpty(at[0])
+                || utils.makeValidFileNameOrEmpty(at[1])
+                || downFileName;
+            if (downFileName.length > 50)
+                downFileName = `${downFileName.substring(0, 50)}_`;
+
+            const ext = `.${book.ext}`;
+            if (downFileName.substring(downFileName.length - ext.length) != ext)
+                downFileName += ext;
+
+            const bookPath = `${book.folder}/${book.file}${ext}`;
+
             //найдем хеш
-            const rows = await db.select({table: 'file_hash', where: `@@id(${db.esc(bookPath)})`});
+            rows = await db.select({table: 'file_hash', where: `@@id(${db.esc(bookPath)})`});
             if (rows.length) {//хеш найден по bookPath
                 const hash = rows[0].hash;
-                const bookFile = `${this.config.filesDir}/${hash}`;
-                const bookFileDesc = `${bookFile}.json`;
+                const bookFile = `${this.config.bookDir}/${hash}`;
+                const bookFileDesc = `${bookFile}.d.json`;
 
                 if (await fs.pathExists(bookFile) && await fs.pathExists(bookFileDesc)) {
-                    link = `${this.config.filesPathStatic}/${hash}`;
+                    link = `${this.config.bookPathStatic}/${hash}`;
                 }
             }
 
             if (!link) {
-                link = await this.restoreBook(bookPath, downFileName)
+                link = await this.restoreBook(bookUid, bookPath, downFileName)
             }
 
             if (!link)
                 throw new Error('404 Файл не найден');
 
-            return {link};
+            return {link, bookPath, downFileName};
         } catch(e) {
             log(LM_ERR, `getBookLink error: ${e.message}`);
             if (e.message.indexOf('ENOENT') >= 0)
@@ -437,48 +509,78 @@ class WebWorker {
         }
     }
 
-    /*
-    async restoreBookFile(publicPath) {
+    async getBookInfo(bookUid) {
         this.checkMyState();
 
         try {
             const db = this.db;
-            const hash = path.basename(publicPath);
 
-            //найдем bookPath и downFileName
-            const rows = await db.select({table: 'file_hash', where: `@@id(${db.esc(hash)})`});        
-            if (rows.length) {//нашли по хешу
-                const rec = rows[0];
-                await this.restoreBook(rec.bookPath, rec.downFileName);
+            let bookInfo = await this.getBookLink(bookUid);
+            const hash = path.basename(bookInfo.link);
+            const bookFile = `${this.config.bookDir}/${hash}`;
+            const bookFileInfo = `${bookFile}.i.json`;
 
-                return rec.downFileName;
-            } else {//bookPath не найден
+            let rows = await db.select({table: 'book', where: `@@hash('_uid', ${db.esc(bookUid)})`});
+            if (!rows.length)
                 throw new Error('404 Файл не найден');
+            const book = rows[0];
+
+            const restoreBookInfo = async(info) => {
+                const result = {};
+
+                result.book = book;
+                result.cover = '';
+                result.fb2 = false;
+                let parser = null;
+
+                if (book.ext == 'fb2') {
+                    const {fb2, cover, coverExt} = await this.fb2Helper.getDescAndCover(bookFile);
+                    parser = fb2;
+                    result.fb2 = fb2.rawNodes;
+
+                    if (cover) {
+                        result.cover = `${this.config.bookPathStatic}/${hash}${coverExt}`;
+                        await fs.writeFile(`${bookFile}${coverExt}`, cover);
+                    }
+                }
+
+                Object.assign(info, result);
+
+                await fs.writeFile(bookFileInfo, JSON.stringify(info));
+
+                if (this.config.branch === 'development') {
+                    await fs.writeFile(`${bookFile}.dev`, `${JSON.stringify(info, null, 2)}\n\n${parser ? parser.toString({format: true}) : ''}`);
+                }
+            };
+
+            if (!await fs.pathExists(bookFileInfo)) {
+                await restoreBookInfo(bookInfo);
+            } else {
+                await utils.touchFile(bookFileInfo);
+                const info = await fs.readFile(bookFileInfo, 'utf-8');
+                const tmpInfo = JSON.parse(info);
+
+                //проверим существование файла обложки, восстановим если нету
+                let coverFile = '';
+                if (tmpInfo.cover)
+                    coverFile = `${this.config.publicFilesDir}${tmpInfo.cover}`;
+
+                if (book.id != tmpInfo.book.id || (coverFile && !await fs.pathExists(coverFile))) {
+                    await restoreBookInfo(bookInfo);
+                } else {
+                    bookInfo = tmpInfo;
+                }
             }
+
+            return {bookInfo};
         } catch(e) {
-            log(LM_ERR, `restoreBookFile error: ${e.message}`);
+            log(LM_ERR, `getBookInfo error: ${e.message}`);
             if (e.message.indexOf('ENOENT') >= 0)
                 throw new Error('404 Файл не найден');
             throw e;
         }
     }
 
-    async getDownFileName(publicPath) {
-        this.checkMyState();
-
-        const db = this.db;
-        const hash = path.basename(publicPath);
-
-        //найдем downFileName
-        const rows = await db.select({table: 'file_hash', where: `@@id(${db.esc(hash)})`});        
-        if (rows.length) {//downFileName найден по хешу
-            return rows[0].downFileName;
-        } else {//bookPath не найден
-            throw new Error('404 Файл не найден');
-        }
-    }
-    */
-
     async getInpxFile(params) {
         let data = null;
         if (params.inpxFileHash && this.inpxFileHash && params.inpxFileHash === this.inpxFileHash) {
@@ -555,7 +657,7 @@ class WebWorker {
             let lastCleanDirTime = 0;
             while (1) {// eslint-disable-line no-constant-condition
                 //чистка папок
-                if (Date.now() - lastCleanDirTime >= cleanDirPeriod) {
+                if (Date.now() - lastCleanDirTime >= cleanDirInterval) {
                     for (const config of dirConfig) {
                         try {
                             await this.cleanDir(config);
@@ -571,7 +673,7 @@ class WebWorker {
             }
         } catch (e) {
             log(LM_FATAL, e.message);
-            ayncExit.exit(1);
+            asyncExit.exit(1);
         }
     }
 
@@ -607,6 +709,27 @@ class WebWorker {
             await utils.sleep(inpxCheckInterval*60*1000);
         }
     }
+
+    async periodicCheckNewRelease() {
+        const checkReleaseLink = this.config.checkReleaseLink;
+        if (!checkReleaseLink)
+            return;
+        const down = new FileDownloader(1024*1024);
+
+        while (1) {// eslint-disable-line no-constant-condition
+            try {
+                let release = await down.load(checkReleaseLink);
+                release = JSON.parse(release.toString());
+
+                if (release.tag_name)
+                    this.config.latestVersion = release.tag_name;
+            } catch(e) {
+                log(LM_ERR, `periodicCheckNewRelease: ${e.message}`);
+            }
+
+            await utils.sleep(checkReleaseInterval);
+        }
+    }
 }
 
 module.exports = WebWorker;

server/core/ZipReader.js

@@ -1,4 +1,4 @@
-const StreamZip = require('node-stream-zip');
+const StreamUnzip = require('node-stream-zip');
 
 class ZipReader {
     constructor() {
@@ -14,7 +14,7 @@ class ZipReader {
         if (this.zip)
             throw new Error('Zip file is already open');
 
-         const zip = new StreamZip.async({file: zipFile, skipEntryNameValidation: true});
+         const zip = new StreamUnzip.async({file: zipFile, skipEntryNameValidation: true});
          
         if (zipEntries)
             this.zipEntries = await zip.entries();

server/core/fb2/Fb2Helper.js

@@ -0,0 +1,100 @@
+const fs = require('fs-extra');
+const iconv = require('iconv-lite');
+const textUtils = require('./textUtils');
+
+const Fb2Parser = require('../fb2/Fb2Parser');
+const utils = require('../utils');
+
+class Fb2Helper {
+    checkEncoding(data) {
+        //Корректируем кодировку UTF-16
+        let encoding = textUtils.getEncoding(data);
+        if (encoding.indexOf('UTF-16') == 0) {
+            data = Buffer.from(iconv.decode(data, encoding));
+            encoding = 'utf-8';
+        }
+
+        //Корректируем пробелы, всякие файлы попадаются :(
+        if (data[0] == 32) {
+            data = Buffer.from(data.toString().trim());
+        }
+
+        //Окончательно корректируем кодировку
+        let result = data;
+
+        let left = data.indexOf('<?xml version="1.0"');
+        if (left < 0) {
+            left = data.indexOf('<?xml version=\'1.0\'');
+        }
+
+        if (left >= 0) {
+            const right = data.indexOf('?>', left);
+            if (right >= 0) {
+                const head = data.slice(left, right + 2).toString();
+                const m = head.match(/encoding=['"](.*?)['"]/);
+                if (m) {
+                    let enc = m[1].toLowerCase();
+                    if (enc != 'utf-8') {
+                        //если кодировка не определена в getEncoding, используем enc
+                        if (encoding.indexOf('ISO-8859') >= 0) {
+                            encoding = enc;
+                        }
+
+                        result = iconv.decode(data, encoding);
+                        result = Buffer.from(result.toString().replace(m[0], `encoding="utf-8"`));
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
+
+    async getDescAndCover(bookFile) {
+        let data = await fs.readFile(bookFile);
+        data = await utils.gunzipBuffer(data);
+
+        data = this.checkEncoding(data);
+
+        const parser = new Fb2Parser();
+
+        parser.fromString(data.toString(), {
+            lowerCase: true,
+            pickNode: route => route.indexOf('fictionbook/body') !== 0,
+        });
+
+        const coverImage = parser.$$('/description/title-info/coverpage/image');
+
+        let cover = null;
+        let coverExt = '';
+        if (coverImage.count) {
+            const coverAttrs = coverImage.attrs();
+            const href = coverAttrs[`${parser.xlinkNS}:href`];
+
+            if (href) {
+                const binaryId = (href[0] == '#' ? href.substring(1) : href);
+
+                //найдем нужный image
+                for (const node of parser.$$array('/binary')) {
+                    let attrs = node.attrs();
+                    if (!attrs)
+                        return;
+
+                    if (attrs.id === binaryId) {
+                        let coverType = attrs['content-type'];
+                        coverType = (coverType == 'image/jpg' || coverType == 'application/octet-stream' ? 'image/jpeg' : coverType);
+                        coverExt = (coverType == 'image/png' ? '.png' : '.jpg');
+
+                        const base64 = node.text();
+                        cover = (base64 ? Buffer.from(base64, 'base64') : null);
+                    }
+                }
+            }
+        }
+
+        parser.remove('binary');
+        return {fb2: parser, cover, coverExt};
+    }
+}
+
+module.exports = Fb2Helper;

server/core/fb2/Fb2Parser.js

@@ -0,0 +1,294 @@
+const XmlParser = require('../xml/XmlParser');
+
+class Fb2Parser extends XmlParser {
+    get xlinkNS() {
+        if (!this._xlinkNS) {
+            const rootAttrs = this.selectFirstSelf().attrs();
+            let ns = 'l';
+            for (const [key, value] of rootAttrs) {
+                if (value == 'http://www.w3.org/1999/xlink') {
+                    ns = key.split(':')[1] || ns;
+                    break;
+                }
+            }
+
+            this._xlinkNS = ns;
+        }
+
+        return this._xlinkNS;
+    }
+
+    bookInfo() {
+        const result = {};
+
+        const desc = this.$$('/description/');
+
+        if (!desc)
+            return result;
+
+        const parseAuthors = (node, tagName) => {
+            const authors = [];
+            for (const a of node.$$array(tagName)) {
+                let names = [];
+                names.push(a.text('/last-name'));
+                names.push(a.text('/first-name'));
+                names.push(a.text('/middle-name'));
+                names = names.filter(n => n);
+                if (!names.length)
+                    names.push(a.text('/nickname'));
+
+                authors.push(names.join(' '));
+            }
+
+            return authors;
+        }
+
+        const parseSequence = (node, tagName) => {
+            const sequence = [];
+            for (const s of node.$$array(tagName)) {
+                const seqAttrs = s.attrs() || {};
+                const name = seqAttrs['name'] || null;
+                const num = seqAttrs['number'] || null;
+                const lang = seqAttrs['xml:lang'] || null;
+
+                sequence.push({name, num, lang});
+            }
+
+            return sequence;
+        }
+
+        const parseTitleInfo = (titleInfo) => {
+            const info = {};
+
+            info.genre = [];
+            for (const g of titleInfo.$$array('genre'))
+                info.genre.push(g.text());
+
+            info.author = parseAuthors(titleInfo, 'author');
+
+            info.bookTitle = titleInfo.text('book-title');
+
+            //annotation как Object
+            info.annotation = titleInfo.$('annotation') && titleInfo.$('annotation').value;
+            info.annotationXml = null;
+            info.annotationHtml = null;
+            if (info.annotation) {
+                //annotation как кусок xml
+                info.annotationXml = titleInfo.$$('annotation/').toString({noHeader: true});
+
+                //annotation как html
+                info.annotationHtml = this.toHtml(info.annotationXml);
+            }
+
+            info.keywords = titleInfo.text('keywords');
+            info.date = titleInfo.text('date');
+            info.coverpage = titleInfo.$('coverpage') && titleInfo.$('coverpage').value;
+            info.lang = titleInfo.text('lang');
+            info.srcLang = titleInfo.text('src-lang');
+
+            info.translator = parseAuthors(titleInfo, 'translator');
+
+            info.sequence = parseSequence(titleInfo, 'sequence');
+
+            return info;
+        }
+
+        //title-info
+        const titleInfo = desc.$$('title-info/');
+        if (titleInfo) {
+            result.titleInfo = parseTitleInfo(titleInfo);
+        }
+
+        //src-title-info
+        const srcTitleInfo = desc.$$('src-title-info/');
+        if (srcTitleInfo) {
+            result.srcTitleInfo = parseTitleInfo(srcTitleInfo);
+        }
+
+        //document-info
+        const documentInfo = desc.$$('document-info/');
+        if (documentInfo) {
+            const info = {};
+
+            info.author = parseAuthors(documentInfo, 'author');
+            info.programUsed = documentInfo.text('program-used');
+            info.date = documentInfo.text('date');
+
+            info.srcUrl = [];
+            for (const url of documentInfo.$$array('src-url'))
+                info.srcUrl.push(url.text());
+
+            info.srcOcr = documentInfo.text('src-ocr');
+            info.id = documentInfo.text('id');
+            info.version = documentInfo.text('version');
+            
+            //аналогично annotation
+            info.history = documentInfo.$('history') && documentInfo.$('history').value;
+            info.historyXml = null;
+            info.historyHtml = null;
+            if (info.history) {
+                //history как кусок xml
+                info.historyXml = documentInfo.$$('history/').toString({noHeader: true});
+
+                //history как html
+                info.historyHtml = this.toHtml(info.historyXml);
+            }
+
+            info.publisher = parseAuthors(documentInfo, 'publisher');
+
+            result.documentInfo = info;
+        }
+
+        //publish-info
+        const publishInfo = desc.$$('publish-info/');
+        if (publishInfo) {
+            const info = {};
+
+            info.bookName = publishInfo.text('book-name');
+            info.publisher = publishInfo.text('publisher');
+            info.city = publishInfo.text('city');
+            info.year = publishInfo.text('year');
+            info.isbn = publishInfo.text('isbn');
+            info.sequence = parseSequence(publishInfo, 'sequence');
+
+            result.publishInfo = info;
+        }
+
+        return result;
+    }
+
+    bookInfoList(bookInfo, options = {}) {
+        let {
+            correctMapping = false,
+            valueToString = false,
+        } = options;
+
+        if (!correctMapping)
+            correctMapping = mapping => mapping;
+
+        const myValueToString = (value, nodePath, origVTS) => {//eslint-disable-line no-unused-vars
+            if (nodePath == 'titleInfo/sequence' 
+                || nodePath == 'srcTitleInfo/sequence' 
+                || nodePath == 'publishInfo/sequence')
+                return value.map(v => [v.name, v.num].filter(s => s).join(' #')).join(', ');
+
+            if (typeof(value) === 'string') {
+                return value;
+            } else if (Array.isArray(value)) {
+                return value.join(', ');
+            } else if (typeof(value) === 'object') {
+                return JSON.stringify(value);
+            }
+
+            return value;
+        };
+
+        if (!valueToString)
+            valueToString = myValueToString;
+
+        let mapping = [
+            {name: 'titleInfo', label: 'Общая информация', value: [
+                {name: 'author', label: 'Автор(ы)'},
+                {name: 'bookTitle', label: 'Название'},
+                {name: 'sequence', label: 'Серия'},
+                {name: 'genre', label: 'Жанр'},
+
+                {name: 'date', label: 'Дата'},
+                {name: 'lang', label: 'Язык книги'},
+                {name: 'srcLang', label: 'Язык оригинала'},
+                {name: 'translator', label: 'Переводчик(и)'},
+                {name: 'keywords', label: 'Ключевые слова'},
+            ]},
+            {name: 'srcTitleInfo', label: 'Информация о произведении на языке оригинала', value: [
+                {name: 'author', label: 'Автор(ы)'},
+                {name: 'bookTitle', label: 'Название'},
+                {name: 'sequence', label: 'Серия'},
+                {name: 'genre', label: 'Жанр'},
+
+                {name: 'date', label: 'Дата'},
+                {name: 'lang', label: 'Язык книги'},
+                {name: 'srcLang', label: 'Язык оригинала'},
+                {name: 'translator', label: 'Переводчик(и)'},
+                {name: 'keywords', label: 'Ключевые слова'},
+            ]},
+            {name: 'publishInfo', label: 'Издательская информация', value: [
+                {name: 'bookName', label: 'Название'},
+                {name: 'publisher', label: 'Издательство'},
+                {name: 'city', label: 'Город'},
+                {name: 'year', label: 'Год'},
+                {name: 'isbn', label: 'ISBN'},
+                {name: 'sequence', label: 'Серия'},
+            ]},
+            {name: 'documentInfo', label: 'Информация о документе (OCR)', value: [
+                {name: 'author', label: 'Автор(ы)'},
+                {name: 'programUsed', label: 'Программа'},
+                {name: 'date', label: 'Дата'},
+                //srcUrl = []
+                {name: 'id', label: 'ID'},
+                {name: 'version', label: 'Версия'},
+                {name: 'srcOcr', label: 'Автор источника'},
+                {name: 'historyHtml', label: 'История'},
+                {name: 'publisher', label: 'Правообладатели'},
+            ]},
+        ];
+
+        mapping = correctMapping(mapping);
+        bookInfo = (bookInfo ? bookInfo : this.bookInfo());
+
+        //заполняем mapping
+        let result = [];
+        for (const item of mapping) {
+            const itemOut = {name: item.name, label: item.label, value: []};
+            const info = bookInfo[item.name];
+            if (!info)
+                continue;
+
+            for (const subItem of item.value) {
+                if (info[subItem.name] !== null) {
+                    const subItemOut = {
+                        name: subItem.name,
+                        label: subItem.label,
+                        value: valueToString(info[subItem.name], `${item.name}/${subItem.name}`, myValueToString),
+                    };
+
+                    if (subItemOut.value)
+                        itemOut.value.push(subItemOut);
+                }
+            }
+
+            if (itemOut.value.length)
+                result.push(itemOut);
+        }
+
+        return result;
+    }
+
+    toHtml(xmlString) {
+        const substs = {
+            '<subtitle>': '<p><b>',
+            '</subtitle>': '</b></p>',
+            '<empty-line/>': '<br>',
+            '<strong>': '<b>',
+            '</strong>': '</b>',
+            '<emphasis>': '<i>',
+            '</emphasis>': '</i>',
+            '<stanza>': '<br>',
+            '</stanza>': '',
+            '<poem>': '<br>',
+            '</poem>': '',
+            '<cite>': '<i>',
+            '</cite>': '</i>',
+            '<table>': '<br>',
+            '</table>': '',
+        };
+
+        for (const [tag, s] of Object.entries(substs)) {
+            const r = new RegExp(tag, 'g');
+            xmlString = xmlString.replace(r, s);
+        }
+
+        return xmlString;
+    }    
+}
+
+module.exports = Fb2Parser;

server/core/fb2/textUtils.js

@@ -0,0 +1,121 @@
+const chardet = require('chardet');
+
+function getEncoding(buf) {
+    let selected = getEncodingLite(buf);
+
+    if (selected == 'ISO-8859-5' && buf.length > 10) {
+        const charsetAll = chardet.analyse(buf.slice(0, 100000));
+        for (const charset of charsetAll) {
+            if (charset.name.indexOf('ISO-8859') < 0) {
+                selected = charset.name;
+                break;
+            }
+        }
+    }
+
+    return selected;
+}
+
+
+function getEncodingLite(buf, returnAll) {
+    const lowerCase = 3;
+    const upperCase = 1;
+
+    const codePage = {
+        'k': 'koi8-r',
+        'w': 'Windows-1251',
+        'd': 'cp866',
+        'i': 'ISO-8859-5',
+        'm': 'maccyrillic',
+        'u': 'utf-8',
+    };
+
+    let charsets = {
+        'k': 0,
+        'w': 0,
+        'd': 0,
+        'i': 0,
+        'm': 0,
+        'u': 0,
+    };
+
+    const len = (buf.length > 100000 ? 100000 : buf.length);
+    let i = 0;
+    let totalChecked = 0;
+    while (i < len) {
+        const char = buf[i];
+        const nextChar = (i < len - 1 ? buf[i + 1] : 0);
+        totalChecked++;
+        i++;
+        //non-russian characters
+        if (char < 128 || char > 256)
+            continue;
+        //UTF-8
+        if ((char == 208 || char == 209) && nextChar >= 128 && nextChar <= 190)
+            charsets['u'] += lowerCase;
+        else {
+            //CP866
+            if ((char > 159 && char < 176) || (char > 223 && char < 242)) charsets['d'] += lowerCase;
+            if ((char > 127 && char < 160)) charsets['d'] += upperCase;
+
+            //KOI8-R
+            if ((char > 191 && char < 223)) charsets['k'] += lowerCase;
+            if ((char > 222 && char < 256)) charsets['k'] += upperCase;
+
+            //WIN-1251
+            if (char > 223 && char < 256) charsets['w'] += lowerCase;
+            if (char > 191 && char < 224) charsets['w'] += upperCase;
+
+            //MAC
+            if (char > 221 && char < 255) charsets['m'] += lowerCase;
+            if (char > 127 && char < 160) charsets['m'] += upperCase;
+
+            //ISO-8859-5
+            if (char > 207 && char < 240) charsets['i'] += lowerCase;
+            if (char > 175 && char < 208) charsets['i'] += upperCase;
+        }
+    }
+
+    let sorted = Object.keys(charsets).map(function(key) {
+        return { codePage: codePage[key], c: charsets[key], totalChecked };
+    });
+
+    sorted.sort((a, b) => b.c - a.c);
+
+    if (returnAll)
+        return sorted;
+    else if (sorted[0].c > 0 && sorted[0].c > sorted[0].totalChecked/2)
+        return sorted[0].codePage;
+    else
+        return 'ISO-8859-5';
+}
+
+function checkIfText(buf) {
+    const enc = getEncodingLite(buf, true);
+    if (enc[0].c > enc[0].totalChecked*0.9)
+        return true;
+
+    let spaceCount = 0;
+    let crCount = 0;
+    let lfCount = 0;
+    for (let i = 0; i < buf.length; i++) {
+        if (buf[i] == 32)
+            spaceCount++;
+        if (buf[i] == 13)
+            crCount++;
+        if (buf[i] == 10)
+            lfCount++;
+    }
+
+    const spaceFreq = spaceCount/(buf.length + 1);
+    const crFreq = crCount/(buf.length + 1);
+    const lfFreq = lfCount/(buf.length + 1);
+
+    return (buf.length < 1000 || spaceFreq > 0.1 || crFreq > 0.03 || lfFreq > 0.03);
+}
+
+module.exports = {
+    getEncoding,
+    getEncodingLite,
+    checkIfText,
+}

server/core/opds/AuthorPage.js

@@ -0,0 +1,203 @@
+const BasePage = require('./BasePage');
+const utils = require('../utils');
+
+class AuthorPage extends BasePage {
+    constructor(config) {
+        super(config);
+
+        this.id = 'author';
+        this.title = 'Авторы';
+    }
+
+    sortBooks(bookList) {
+        //схлопывание серий
+        const books = [];
+        const seriesMap = new Map();
+        for (const book of bookList) {
+            if (book.series) {
+                let seriesIndex = seriesMap.get(book.series);
+                if (seriesIndex === undefined) {
+                    seriesIndex = books.length;
+                    books.push({
+                        type: 'series',
+                        book,
+                        bookCount: 0,
+                    });
+
+                    seriesMap.set(book.series, seriesIndex);
+                }
+
+                books[seriesIndex].bookCount++;
+            } else {
+                books.push({
+                    type: 'book',
+                    book
+                });
+            }
+        }
+
+        //сортировка
+        books.sort((a, b) => {
+            if (a.type == 'series') {
+                return (b.type == 'series' ? a.book.series.localeCompare(b.book.series) : -1);
+            } else {
+                return (b.type == 'book' ? a.book.title.localeCompare(b.book.title) : 1);
+            }
+        });
+
+        return books;
+    }
+
+    sortSeriesBooks(seriesBooks) {
+        seriesBooks.sort((a, b) => {
+            const dserno = (a.serno || Number.MAX_VALUE) - (b.serno || Number.MAX_VALUE);
+            const dtitle = a.title.localeCompare(b.title);
+            const dext = a.ext.localeCompare(b.ext);
+            return (dserno ? dserno : (dtitle ? dtitle : dext));        
+        });
+
+        return seriesBooks;
+    }
+
+    async body(req) {
+        const result = {};
+
+        const query = {
+            author: req.query.author || '',
+            series: req.query.series || '',
+            genre: req.query.genre || '',
+            del: '0',
+            
+            all: req.query.all || '',
+            depth: 0,
+        };
+        query.depth = query.author.length + 1;
+
+        if (query.author == '___others') {
+            query.author = '';
+            query.depth = 1;
+            query.others = true;
+        }
+
+        const entry = [];
+        if (query.series) {
+            //книги по серии
+            const bookList = await this.webWorker.getSeriesBookList(query.series);
+
+            if (bookList.books) {
+                let books = bookList.books;
+                const booksAll = this.filterBooks(books);
+                const filtered = (query.all ? booksAll : this.filterBooks(books, query));
+                const sorted = this.sortSeriesBooks(filtered);
+
+                if (booksAll.length > filtered.length) {
+                    entry.push(
+                        this.makeEntry({
+                            id: 'all_series_books',
+                            title: '[Все книги серии]',
+                            link: this.navLink({
+                                href: `/${this.id}?author=${encodeURIComponent(query.author)}` +
+                                    `&series=${encodeURIComponent(query.series)}&all=1`}),
+                        })
+                    );
+                }
+
+                for (const book of sorted) {
+                    const title = `${book.serno ? `${book.serno}. `: ''}${book.title || 'Без названия'} (${book.ext})`;
+
+                    entry.push(
+                        this.makeEntry({
+                            id: book._uid,
+                            title,
+                            link: this.acqLink({href: `/book?uid=${encodeURIComponent(book._uid)}`}),
+                            content: {
+                                '*ATTRS': {type: 'text'},
+                                '*TEXT': this.bookAuthor(book.author),
+                            },
+                        })
+                    );
+                }
+            }
+        } else if (query.author && query.author[0] == '=') {
+            //книги по автору
+            const bookList = await this.webWorker.getAuthorBookList(0, query.author.substring(1));
+
+            if (bookList.books) {
+                let books = bookList.books;
+                books = this.sortBooks(this.filterBooks(books, query));
+
+                for (const b of books) {
+                    if (b.type == 'series') {
+                        entry.push(
+                            this.makeEntry({
+                                id: b.book._uid,
+                                title: `Серия: ${b.book.series}`,
+                                link: this.navLink({
+                                    href: `/${this.id}?author=${encodeURIComponent(query.author)}` +
+                                        `&series=${encodeURIComponent(b.book.series)}&genre=${encodeURIComponent(query.genre)}`}),
+                                content: {
+                                    '*ATTRS': {type: 'text'},
+                                    '*TEXT': `${b.bookCount} книг${utils.wordEnding(b.bookCount, 8)} по автору${(query.genre ? ' (в выбранном жанре)' : '')}`,
+                                },
+                            })
+                        );
+                    } else {
+                        const title = `${b.book.title || 'Без названия'} (${b.book.ext})`;
+                        entry.push(
+                            this.makeEntry({
+                                id: b.book._uid,
+                                title,
+                                link: this.acqLink({href: `/book?uid=${encodeURIComponent(b.book._uid)}`}),
+                                content: {
+                                    '*ATTRS': {type: 'text'},
+                                    '*TEXT': this.bookAuthor(b.book.author),
+                                },
+                            })
+                        );
+                    }
+                }
+            }
+        } else {
+            if (query.depth == 1 && !query.genre && !query.others) {
+                entry.push(
+                    this.makeEntry({
+                        id: 'select_genre',
+                        title: '[Выбрать жанр]',
+                        link: this.navLink({href: `/genre?from=${this.id}`}),
+                    })
+                );
+            }
+
+            //навигация по каталогу
+            const queryRes = await this.opdsQuery('author', query, '[Остальные авторы]');
+
+            for (const rec of queryRes) {
+                const e = {
+                    id: rec.id,
+                    title: this.bookAuthor(rec.title),
+                    link: this.navLink({href: `/${this.id}?author=${rec.q}&genre=${encodeURIComponent(query.genre)}`}),
+                };
+
+                let countStr = '';
+                if (rec.count)
+                    countStr = `${rec.count} автор${utils.wordEnding(rec.count, 0)}${(query.genre ? ' (в выбранном жанре)' : '')}`;
+                if (!countStr && rec.bookCount && !query.genre)
+                    countStr = `${rec.bookCount} книг${utils.wordEnding(rec.bookCount, 8)}`;
+
+                if (countStr) {
+                    e.content = {
+                        '*ATTRS': {type: 'text'},
+                        '*TEXT': countStr,
+                    };
+                }
+
+                entry.push(this.makeEntry(e));
+            }
+        }
+
+        result.entry = entry;
+        return this.makeBody(result, req);
+    }
+}
+
+module.exports = AuthorPage;

server/core/opds/BasePage.js

@@ -0,0 +1,374 @@
+const _ = require('lodash');
+const he = require('he');
+
+const WebWorker = require('../WebWorker');//singleton
+const XmlParser = require('../xml/XmlParser');
+
+const spaceChar = String.fromCodePoint(0x00B7);
+const emptyFieldValue = '?';
+const maxUtf8Char = String.fromCodePoint(0xFFFFF);
+const ruAlphabet = 'абвгдеёжзийклмнопрстуфхцчшщъыьэюя';
+const enAlphabet = 'abcdefghijklmnopqrstuvwxyz';
+const enruArr = (ruAlphabet + enAlphabet).split('');
+const enru = new Set(enruArr);
+const ruOnly = new Set(ruAlphabet.split(''));
+
+class BasePage {
+    constructor(config) {        
+        this.config = config;
+
+        this.webWorker = new WebWorker(config);
+        this.rootTag = 'feed';
+        this.opdsRoot = config.opdsRoot;
+
+        this.showDeleted = false;
+    }
+
+    escape(s) {
+        //костыль для koreader, не понимает hex-экранирование вида '
+        return he.escape(s).replace(/'/g, ''').replace(/`/g, '`');
+    }
+
+    makeEntry(entry = {}) {
+        if (!entry.id)
+            throw new Error('makeEntry: no id');
+        if (!entry.title)
+            throw new Error('makeEntry: no title');
+
+        entry.title = this.escape(entry.title);
+
+        const result = {
+            updated: (new Date()).toISOString().substring(0, 19) + 'Z',
+        };
+
+        return Object.assign(result, entry);
+    }
+
+    myEntry() {
+        return this.makeEntry({
+            id: this.id,
+            title: this.title, 
+            link: this.navLink({href: `/${this.id}`}),
+        });
+    }
+
+    makeLink(attrs) {
+        attrs.href = this.escape(attrs.href);
+        return {'*ATTRS': attrs};
+    }
+
+    navLink(attrs) {
+        return this.makeLink({
+            href: (attrs.hrefAsIs ? attrs.href : `${this.opdsRoot}${attrs.href || ''}`),
+            rel: attrs.rel || 'subsection',
+            type: 'application/atom+xml;profile=opds-catalog;kind=navigation',
+        });
+    }
+
+    acqLink(attrs) {
+        return this.makeLink({
+            href: (attrs.hrefAsIs ? attrs.href : `${this.opdsRoot}${attrs.href || ''}`),
+            rel: attrs.rel || 'subsection',
+            type: 'application/atom+xml;profile=opds-catalog;kind=acquisition',
+        });
+    }
+
+    downLink(attrs) {
+        if (!attrs.href)
+            throw new Error('downLink: no href');
+        if (!attrs.type)
+            throw new Error('downLink: no type');
+
+        return this.makeLink({
+            href: attrs.href,
+            rel: 'http://opds-spec.org/acquisition',
+            type: attrs.type,
+        });
+    }
+
+    imgLink(attrs) {
+        if (!attrs.href)
+            throw new Error('imgLink: no href');
+
+        return this.makeLink({
+            href: attrs.href,
+            rel: `http://opds-spec.org/image${attrs.thumb ? '/thumbnail' : ''}`,
+            type: attrs.type || 'image/jpeg',
+        });
+    }
+
+    baseLinks(req, selfAcq = false) {
+        const result = [
+            this.makeLink({href: `${this.opdsRoot}/opensearch`, rel: 'search', type: 'application/opensearchdescription+xml'}),
+            this.makeLink({href: `${this.opdsRoot}/search?term={searchTerms}`, rel: 'search', type: 'application/atom+xml'}),
+
+            this.navLink({rel: 'start'}),
+        ];
+        
+        if (selfAcq) {
+            result.push(this.acqLink({rel: 'self', href: req.originalUrl, hrefAsIs: true}));
+        } else {
+            result.push(this.navLink({rel: 'self', href: req.originalUrl, hrefAsIs: true}));
+        }
+
+        return result;
+    }
+
+    makeBody(content, req) {
+        const base = this.makeEntry({id: this.id, title: this.title});
+        base['*ATTRS'] = {
+            'xmlns': 'http://www.w3.org/2005/Atom',
+            'xmlns:dc': 'http://purl.org/dc/terms/',
+            'xmlns:opds': 'http://opds-spec.org/2010/catalog',
+        };
+
+        if (!content.link)
+            base.link = this.baseLinks(req);
+
+        const xml = new XmlParser();
+        const xmlObject = {};        
+        xmlObject[this.rootTag] = Object.assign(base, content);
+
+        xml.fromObject(xmlObject);
+
+        return xml.toString({format: true});
+    }
+
+    async body() {
+        throw new Error('Body not implemented');
+    }
+
+    // -- stuff -------------------------------------------
+    async search(from, query) {
+        const result = [];
+        const queryRes = await this.webWorker.search(from, query);
+
+        for (const row of queryRes.found) {
+            const rec = {
+                id: row.id,
+                title: (row[from] || 'Без автора'),
+                q: `=${encodeURIComponent(row[from])}`,
+                bookCount: row.bookCount,
+            };
+
+            result.push(rec);
+        }
+
+        return result;
+    }
+
+    async opdsQuery(from, query, otherTitle = '[Другие]', prevLen = 0) {
+        const queryRes = await this.webWorker.opdsQuery(from, query);
+        let count = 0;
+        for (const row of queryRes.found)
+            count += row.count;
+
+        const others = [];
+        let result = [];
+        if (count <= 50) {
+            //конец навигации
+            return await this.search(from, query);
+        } else {
+            let len = 0;
+            const enResult = [];
+            for (const row of queryRes.found) {
+                const value = row.value;
+                len += value.length;
+
+                let rec;
+                if (row.count == 1) {
+                    rec = {
+                        id: row.id,
+                        title: row.name,
+                        q: `=${encodeURIComponent(row.name)}`,
+                        bookCount: row.bookCount,
+                    };
+                } else {
+                    rec = {
+                        id: row.id,
+                        title: `${value.toUpperCase().replace(/ /g, spaceChar)}~`,
+                        q: encodeURIComponent(value),
+                        count: row.count,
+                    };
+                }
+                if (query.depth > 1 || enru.has(value[0]) ) {
+                    //такой костыль из-за проблем с локалями в pkg
+                    //русский язык всегда идет первым!
+                    if (ruOnly.has(value[0]))
+                        result.push(rec)
+                    else
+                        enResult.push(rec);
+                } else {
+                    others.push(rec);
+                }
+            }
+
+            result = result.concat(enResult);
+
+            if (query[from] && query.depth > 1 && result.length < 10 && len > prevLen) {
+                //рекурсия, с увеличением глубины, для облегчения навигации
+                const newQuery = _.cloneDeep(query);
+                newQuery.depth++;
+                return await this.opdsQuery(from, newQuery, otherTitle, len);
+            }
+        }
+
+        if (!query.others && others.length)
+            result.unshift({id: 'other', title: otherTitle, q: '___others', count: others.length});
+
+        return (!query.others ? result : others);
+    }
+
+    //скопировано из BaseList.js, часть функционала не используется
+    filterBooks(books, query = {}) {
+        const s = query;
+
+        const splitAuthor = (author) => {
+            if (!author) {
+                author = emptyFieldValue;
+            }
+
+            const result = author.split(',');
+            if (result.length > 1)
+                result.push(author);
+
+            return result;
+        };
+
+        const filterBySearch = (bookValue, searchValue) => {
+            if (!searchValue)
+                return true;
+
+            if (!bookValue)
+                bookValue = emptyFieldValue;
+
+            bookValue = bookValue.toLowerCase();
+            if (searchValue[0] !== '~')
+                searchValue = searchValue.toLowerCase();
+
+            //особая обработка префиксов
+            if (searchValue[0] == '=') {
+
+                searchValue = searchValue.substring(1);
+                return bookValue.localeCompare(searchValue) == 0;
+            } else if (searchValue[0] == '*') {
+
+                searchValue = searchValue.substring(1);
+                return bookValue !== emptyFieldValue && bookValue.indexOf(searchValue) >= 0;
+            } else if (searchValue[0] == '#') {
+
+                searchValue = searchValue.substring(1);
+                if (!bookValue)
+                    return false;
+                return bookValue !== emptyFieldValue && !enru.has(bookValue[0]) && bookValue.indexOf(searchValue) >= 0;
+            } else if (searchValue[0] == '~') {//RegExp
+
+                searchValue = searchValue.substring(1);
+                const re = new RegExp(searchValue, 'i');
+                return re.test(bookValue);
+            } else {
+                //where = `@dirtyIndexLR('value', ${db.esc(a)}, ${db.esc(a + maxUtf8Char)})`;
+                return bookValue.localeCompare(searchValue) >= 0 && bookValue.localeCompare(searchValue + maxUtf8Char) <= 0;
+            }
+        };
+
+        return books.filter((book) => {
+            //author
+            let authorFound = false;
+            const authors = splitAuthor(book.author);
+            for (const a of authors) {
+                if (filterBySearch(a, s.author)) {
+                    authorFound = true;
+                    break;
+                }
+            }
+
+            //genre
+            let genreFound = !s.genre;
+            if (!genreFound) {
+                const searchGenres = new Set(s.genre.split(','));
+                const bookGenres = book.genre.split(',');
+
+                for (let g of bookGenres) {
+                    if (!g)
+                        g = emptyFieldValue;
+
+                    if (searchGenres.has(g)) {
+                        genreFound = true;
+                        break;
+                    }
+                }
+            }
+
+            //lang
+            let langFound = !s.lang;
+            if (!langFound) {
+                const searchLang = new Set(s.lang.split(','));
+                langFound = searchLang.has(book.lang || emptyFieldValue);
+            }
+
+            //date
+            let dateFound = !s.date;
+            if (!dateFound) {
+                const date = this.queryDate(s.date).split(',');
+                let [from = '0000-00-00', to = '9999-99-99'] = date;
+
+                dateFound = (book.date >= from && book.date <= to);
+            }
+
+            //librate
+            let librateFound = !s.librate;
+            if (!librateFound) {
+                const searchLibrate = new Set(s.librate.split(',').map(n => parseInt(n, 10)).filter(n => !isNaN(n)));
+                librateFound = searchLibrate.has(book.librate);
+            }
+
+            return (this.showDeleted || !book.del)
+                && authorFound
+                && filterBySearch(book.series, s.series)
+                && filterBySearch(book.title, s.title)
+                && genreFound
+                && langFound
+                && dateFound
+                && librateFound
+            ;
+        });
+    }
+
+    bookAuthor(author) {
+        if (author) {
+            let a = author.split(',');
+            return a.slice(0, 3).join(', ') + (a.length > 3 ? ' и др.' : '');
+        }
+
+        return '';
+    }
+
+    async getGenres() {
+        let result;
+        if (!this.genres) {
+            const res = await this.webWorker.getGenreTree();
+
+            result = {
+                genreTree: res.genreTree,
+                genreMap: new Map(),
+                genreSection: new Map(),
+            };
+
+            for (const section of result.genreTree) {
+                result.genreSection.set(section.name, section.value);
+
+                for (const g of section.value)
+                    result.genreMap.set(g.value, g.name);
+            }
+
+            this.genres = result;
+        } else {
+            result = this.genres;
+        }
+
+        return result;
+    }
+}
+
+module.exports = BasePage;

server/core/opds/BookPage.js

@@ -0,0 +1,226 @@
+const path = require('path');
+const _ = require('lodash');
+const dayjs = require('dayjs');
+
+const BasePage = require('./BasePage');
+const Fb2Parser = require('../fb2/Fb2Parser');
+
+class BookPage extends BasePage {
+    constructor(config) {
+        super(config);
+
+        this.id = 'book';
+        this.title = 'Книга';
+
+    }
+
+    formatSize(size) {
+        size = size/1024;
+        let unit = 'KB';
+        if (size > 1024) {
+            size = size/1024;
+            unit = 'MB';
+        }
+        return `${size.toFixed(1)} ${unit}`;
+    }
+
+    inpxInfo(bookRec) {
+        const mapping = [
+            {name: 'fileInfo', label: 'Информация о файле', value: [
+                {name: 'folder', label: 'Папка'},
+                {name: 'file', label: 'Файл'},
+                {name: 'size', label: 'Размер'},
+                {name: 'date', label: 'Добавлен'},
+                {name: 'del', label: 'Удален'},
+                {name: 'libid', label: 'LibId'},
+                {name: 'insno', label: 'InsideNo'},
+            ]},
+
+            {name: 'titleInfo', label: 'Общая информация', value: [
+                {name: 'author', label: 'Автор(ы)'},
+                {name: 'title', label: 'Название'},
+                {name: 'series', label: 'Серия'},
+                {name: 'genre', label: 'Жанр'},
+                {name: 'librate', label: 'Оценка'},
+                {name: 'lang', label: 'Язык книги'},
+                {name: 'keywords', label: 'Ключевые слова'},
+            ]},
+        ];
+
+        const valueToString = (value, nodePath, b) => {//eslint-disable-line no-unused-vars
+            if (nodePath == 'fileInfo/file')
+                return `${value}.${b.ext}`;
+
+            if (nodePath == 'fileInfo/size')
+                return `${this.formatSize(value)} (${value.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1 ')} Bytes)`;
+
+            if (nodePath == 'fileInfo/date')
+                return dayjs(value, 'YYYY-MM-DD').format('DD.MM.YYYY');
+
+            if (nodePath == 'fileInfo/del')
+                return (value ? 'Да' : null);
+
+            if (nodePath == 'fileInfo/insno')
+                return (value ? value : null);
+
+            if (nodePath == 'titleInfo/author')
+                return value.split(',').join(', ');
+
+            if (nodePath == 'titleInfo/librate' && !value)
+                return null;
+
+            if (typeof(value) === 'string') {
+                return value;
+            }
+
+            return (value.toString ? value.toString() : '');
+        };
+
+        let result = [];
+        const book = _.cloneDeep(bookRec);
+        book.series = [book.series, book.serno].filter(v => v).join(' #');
+
+        for (const item of mapping) {
+            const itemOut = {name: item.name, label: item.label, value: []};
+
+            for (const subItem of item.value) {
+                const subItemOut = {
+                    name: subItem.name,
+                    label: subItem.label,
+                    value: valueToString(book[subItem.name], `${item.name}/${subItem.name}`, book)
+                };
+                if (subItemOut.value)
+                    itemOut.value.push(subItemOut);
+            }
+
+            if (itemOut.value.length)
+                result.push(itemOut);
+        }
+
+        return result;
+    }    
+
+    htmlInfo(title, infoList) {
+        let info = '';
+        for (const part of infoList) {
+            if (part.value.length)
+                info += `<h3>${part.label}</h3>`;
+            for (const rec of part.value)
+                info += `<p>${rec.label}: ${rec.value}</p>`;
+        }
+
+        if (info)
+            info = `<h2>${title}</h2>${info}`;
+
+        return info;
+    }
+
+    async body(req) {
+        const result = {};
+
+        result.link = this.baseLinks(req, true);
+
+        const bookUid = req.query.uid;
+        const entry = [];
+        if (bookUid) {            
+            const {bookInfo} = await this.webWorker.getBookInfo(bookUid);
+
+            if (bookInfo) {
+                const {genreMap} = await this.getGenres();
+
+                //format
+                const ext = bookInfo.book.ext;
+                const formats = {
+                    [`${ext}+zip`]: `${bookInfo.link}/zip`,
+                    [ext]: bookInfo.link,
+                };
+
+                if (ext === 'mobi') {
+                    formats['x-mobipocket-ebook'] = bookInfo.link;
+                } else if (ext == 'epub') {
+                    formats[`${ext}+zip`] = bookInfo.link;
+                }
+
+                //entry
+                const e = this.makeEntry({
+                    id: bookUid,
+                    title: bookInfo.book.title || 'Без названия',
+                });
+
+                //author bookInfo
+                if (bookInfo.book.author) {
+                    e.author = bookInfo.book.author.split(',').map(a => ({name: a}));
+                }
+
+                e['dc:language'] = bookInfo.book.lang;
+                e['dc:format'] = ext;
+
+                //genre
+                const genre = bookInfo.book.genre.split(',');
+                for (const g of genre) {
+                    const genreName = genreMap.get(g);
+                    if (genreName) {
+                        if (!e.category)
+                            e.category = [];
+                        e.category.push({
+                            '*ATTRS': {term: genreName, label: genreName},
+                        });
+                    }
+                }
+
+                let content = '';
+                let ann = '';
+                let info = '';
+                //fb2 info
+                if (bookInfo.fb2) {
+                    const parser = new Fb2Parser(bookInfo.fb2);
+                    const infoObj = parser.bookInfo();
+
+                    if (infoObj.titleInfo) {
+                        //author fb2Info
+                        if (!e.author && infoObj.titleInfo.author.length) {
+                            e.author = infoObj.titleInfo.author.map(a => ({name: a}));
+                        }
+
+                        ann = infoObj.titleInfo.annotationHtml || '';
+                        const infoList = parser.bookInfoList(infoObj);
+                        info += this.htmlInfo('Fb2 инфо', infoList);
+                    }
+                }
+
+                //content
+                info += this.htmlInfo('Inpx инфо', this.inpxInfo(bookInfo.book));
+
+                content = `${ann}${info}`;
+                if (content) {
+                    e.content = {
+                        '*ATTRS': {type: 'text/html'},
+                        '*TEXT': this.escape(content),
+                    };
+                }
+
+                //links
+                e.link = [];
+                for (const [fileFormat, downHref] of Object.entries(formats))
+                    e.link.push(this.downLink({href: downHref, type: `application/${fileFormat}`}));
+
+                if (bookInfo.cover) {
+                    let coverType = 'image/jpeg';
+                    if (path.extname(bookInfo.cover) == '.png')
+                        coverType = 'image/png';
+
+                    e.link.push(this.imgLink({href: bookInfo.cover, type: coverType}));
+                    e.link.push(this.imgLink({href: bookInfo.cover, type: coverType, thumb: true}));
+                }
+
+                entry.push(e);
+            }
+        }
+
+        result.entry = entry;
+
+        return this.makeBody(result, req);
+    }
+}
+
+module.exports = BookPage;

server/core/opds/GenrePage.js

@@ -0,0 +1,76 @@
+const BasePage = require('./BasePage');
+
+class GenrePage extends BasePage {
+    constructor(config) {
+        super(config);
+
+        this.id = 'genre';
+        this.title = 'Жанры';
+
+    }
+
+    async body(req) {
+        const result = {};
+
+        const query = {
+            from: req.query.from || 'search',
+            term: req.query.term || '',
+            section: req.query.section || '',
+        };
+
+        let searchQuery = '';
+        if (query.from == 'search')
+            searchQuery = `&type=title&term=${encodeURIComponent(query.term)}`;
+
+        const entry = [];
+        if (query.from) {
+            if (query.section) {
+                //выбираем подразделы
+                const {genreSection} = await this.getGenres();
+                const section = genreSection.get(query.section);
+
+                if (section) {
+                    let id = 0;
+                    const all = [];
+                    for (const g of section) {
+                        all.push(g.value);
+                        entry.push(
+                            this.makeEntry({
+                                id: ++id,
+                                title: g.name,
+                                link: this.navLink({href: `/${encodeURIComponent(query.from)}?genre=${encodeURIComponent(g.value)}${searchQuery}`}),
+                            })
+                        );
+                    }
+
+                    entry.unshift(
+                        this.makeEntry({
+                            id: 'whole_section',
+                            title: '[Весь раздел]',
+                            link: this.navLink({href: `/${encodeURIComponent(query.from)}?genre=${encodeURIComponent(all.join(','))}${searchQuery}`}),
+                        })
+                    );
+                }
+            } else {
+                //выбираем разделы
+                const {genreTree} = await this.getGenres();
+                let id = 0;
+                for (const section of genreTree) {
+                    entry.push(
+                        this.makeEntry({
+                            id: ++id,
+                            title: section.name,
+                            link: this.navLink({href: `/genre?from=${encodeURIComponent(query.from)}&section=${encodeURIComponent(section.name)}${searchQuery}`}),
+                        })
+                    );
+                }
+            }
+        }
+
+        result.entry = entry;
+
+        return this.makeBody(result, req);
+    }
+}
+
+module.exports = GenrePage;

server/core/opds/OpensearchPage.js

@@ -0,0 +1,45 @@
+const BasePage = require('./BasePage');
+const XmlParser = require('../xml/XmlParser');
+
+class OpensearchPage extends BasePage {
+    constructor(config) {
+        super(config);
+
+        this.id = 'opensearch';
+        this.title = 'opensearch';
+    }
+
+    async body() {
+        const xml = new XmlParser();
+        const xmlObject = {};        
+/*
+<?xml version="1.0" encoding="utf-8"?>
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+  <ShortName>inpx-web</ShortName>
+  <Description>Поиск по каталогу</Description>
+  <InputEncoding>UTF-8</InputEncoding>
+  <OutputEncoding>UTF-8</OutputEncoding>
+  <Url type="application/atom+xml;profile=opds-catalog;kind=navigation" template="/opds/search?term={searchTerms}"/>
+</OpenSearchDescription>
+*/        
+        xmlObject['OpenSearchDescription'] = {
+            '*ATTRS': {xmlns: 'http://a9.com/-/spec/opensearch/1.1/'},
+            ShortName: 'inpx-web',
+            Description: 'Поиск по каталогу',
+            InputEncoding: 'UTF-8',
+            OutputEncoding: 'UTF-8',
+            Url: {
+                '*ATTRS': {
+                    type: 'application/atom+xml;profile=opds-catalog;kind=navigation',
+                    template: `${this.opdsRoot}/search?term={searchTerms}`,
+                },
+            },
+        }
+
+        xml.fromObject(xmlObject);
+
+        return xml.toString({format: true});
+    }
+}
+
+module.exports = OpensearchPage;

server/core/opds/RootPage.js

@@ -0,0 +1,42 @@
+const BasePage = require('./BasePage');
+const AuthorPage = require('./AuthorPage');
+const SeriesPage = require('./SeriesPage');
+const TitlePage = require('./TitlePage');
+const GenrePage = require('./GenrePage');
+
+class RootPage extends BasePage {
+    constructor(config) {
+        super(config);
+
+        this.id = 'root';
+        this.title = '';
+
+        this.authorPage = new AuthorPage(config);
+        this.seriesPage = new SeriesPage(config);
+        this.titlePage = new TitlePage(config);
+        this.genrePage = new GenrePage(config);
+    }
+
+    async body(req) {
+        const result = {};
+
+        if (!this.title) {
+            const dbConfig = await this.webWorker.dbConfig();
+            const collection = dbConfig.inpxInfo.collection.split('\n');
+            this.title = collection[0].trim();
+            if (!this.title)
+                this.title = 'Неизвестная коллекция';
+        }
+
+        result.entry = [
+            this.authorPage.myEntry(),
+            this.seriesPage.myEntry(),
+            this.titlePage.myEntry(),
+            this.genrePage.myEntry(),
+        ];
+
+        return this.makeBody(result, req);
+    }
+}
+
+module.exports = RootPage;

server/core/opds/SearchHelpPage.js

@@ -0,0 +1,60 @@
+const BasePage = require('./BasePage');
+
+class SearchHelpPage extends BasePage {
+    constructor(config) {
+        super(config);
+
+        this.id = 'search_help';
+        this.title = 'Памятка по поиску';
+
+    }
+
+    async body(req) {
+        const result = {};
+
+        result.link = this.baseLinks(req, true);
+
+        const content = `
+Формат поискового значения:
+<ul>
+    <li>
+        без префикса: значение трактуется, как "начинается с"
+    </li>
+    <li>
+        префикс "=": поиск по точному совпадению
+    </li>
+    <li>
+        префикс "*": поиск подстроки в строке
+    </li>
+    <li>
+        префикс "#": поиск подстроки в строке, но только среди значений, начинающихся не с латинского или кириллического символа
+    </li>
+    <li>
+        префикс "~": поиск по регулярному выражению
+    </li>
+    <li>
+        префикс "?": поиск пустых значений или тех, что начинаются с этого символа
+    </li>
+</ul>
+`;
+        const entry = [
+            this.makeEntry({
+                id: 'help',
+                title: this.title,
+                content: {
+                    '*ATTRS': {type: 'text/html'},
+                    '*TEXT': this.escape(content),
+                },
+                link: [
+                    this.downLink({href: '/book/fake-link', type: `application/fb2+zip`})
+                ],
+            })
+        ];
+
+        result.entry = entry;
+
+        return this.makeBody(result, req);
+    }
+}
+
+module.exports = SearchHelpPage;

server/core/opds/SearchPage.js

@@ -0,0 +1,136 @@
+const BasePage = require('./BasePage');
+const utils = require('../utils');
+const iconv = require('iconv-lite');
+
+class SearchPage extends BasePage {
+    constructor(config) {
+        super(config);
+
+        this.id = 'search';
+        this.title = 'Поиск';
+    }
+
+    async body(req) {
+        const result = {};
+
+        const query = {
+            type: req.query.type || '',
+            term: req.query.term || '',
+            genre: req.query.genre || '',
+            page: parseInt(req.query.page, 10) || 1,
+        };
+
+        let entry = [];
+        if (query.type) {
+            if (['author', 'series', 'title'].includes(query.type)) {
+                try {
+                    const from = query.type;
+                    const page = query.page;
+
+                    const limit = 100;
+                    const offset = (page - 1)*limit;
+
+                    const searchQuery = {[from]: query.term, genre: query.genre, del: '0', offset, limit};
+                    let queryRes = await this.webWorker.search(from, searchQuery);
+                    
+                    if (queryRes.totalFound === 0) { // не нашли ничего, проверим, может term в кодировке ISO-8859-1 (баг koreader)
+                        searchQuery[from] = iconv.encode(query.term, 'ISO-8859-1').toString();
+                        queryRes = await this.webWorker.search(from, searchQuery);
+                    }
+
+                    const found = queryRes.found;
+
+                    for (let i = 0; i < found.length; i++) {
+                        const row = found[i];
+                        if (!row.bookCount)
+                            continue;
+
+                        entry.push(
+                            this.makeEntry({
+                                id: row.id,
+                                title: `${(from === 'series' ? 'Серия: ': '')}${from === 'author' ? this.bookAuthor(row[from]) : row[from]}`,
+                                link: this.navLink({href: `/${from}?${from}==${encodeURIComponent(row[from])}`}),
+                                content: {
+                                    '*ATTRS': {type: 'text'},
+                                    '*TEXT': `${row.bookCount} книг${utils.wordEnding(row.bookCount, 8)}`,
+                                },
+                            }),
+                        );
+                    }
+
+                    if (queryRes.totalFound > offset + found.length) {
+                        entry.push(
+                            this.makeEntry({
+                                id: 'next_page',
+                                title: '[Следующая страница]',
+                                link: this.navLink({href: `/${this.id}?type=${from}&term=${encodeURIComponent(query.term)}&genre=${encodeURIComponent(query.genre)}&page=${page + 1}`}),
+                            })
+                        );
+                    }
+                } catch(e) {
+                    entry.push(
+                        this.makeEntry({
+                            id: 'error',
+                            title: `Ошибка: ${e.message}`,
+                            link: this.navLink({href: `/fake-error-link`}),
+                        })
+                    );
+                }
+            }
+        } else {
+            //корневой раздел
+            entry = [
+                this.makeEntry({
+                    id: 'search_author',
+                    title: 'Поиск авторов',
+                    link: this.navLink({href: `/${this.id}?type=author&term=${encodeURIComponent(query.term)}`}),
+                    content: {
+                        '*ATTRS': {type: 'text'},
+                        '*TEXT': `Искать по именам авторов`,
+                    },
+                }),
+                this.makeEntry({
+                    id: 'search_series',
+                    title: 'Поиск серий',
+                    link: this.navLink({href: `/${this.id}?type=series&term=${encodeURIComponent(query.term)}`}),
+                    content: {
+                        '*ATTRS': {type: 'text'},
+                        '*TEXT': `Искать по названиям серий`,
+                    },
+                }),
+                this.makeEntry({
+                    id: 'search_title',
+                    title: 'Поиск книг',
+                    link: this.navLink({href: `/${this.id}?type=title&term=${encodeURIComponent(query.term)}`}),
+                    content: {
+                        '*ATTRS': {type: 'text'},
+                        '*TEXT': `Искать по названиям книг`,
+                    },
+                }),
+                this.makeEntry({
+                    id: 'search_genre',
+                    title: 'Поиск книг в жанре',
+                    link: this.navLink({href: `/genre?from=search&term=${encodeURIComponent(query.term)}`}),
+                    content: {
+                        '*ATTRS': {type: 'text'},
+                        '*TEXT': `Искать по названиям книг в выбранном жанре`,
+                    },
+                }),
+                this.makeEntry({
+                    id: 'search_help',
+                    title: '[Памятка по поиску]',
+                    link: this.acqLink({href: `/search-help`}),
+                    content: {
+                        '*ATTRS': {type: 'text'},
+                        '*TEXT': `Описание формата поискового значения`,
+                    },
+                }),
+            ]
+        }
+
+        result.entry = entry;
+        return this.makeBody(result, req);
+    }
+}
+
+module.exports = SearchPage;

server/core/opds/SeriesPage.js

@@ -0,0 +1,123 @@
+const BasePage = require('./BasePage');
+const utils = require('../utils');
+
+class SeriesPage extends BasePage {
+    constructor(config) {
+        super(config);
+
+        this.id = 'series';
+        this.title = 'Серии';
+    }
+
+    sortSeriesBooks(seriesBooks) {
+        seriesBooks.sort((a, b) => {
+            const dserno = (a.serno || Number.MAX_VALUE) - (b.serno || Number.MAX_VALUE);
+            const dtitle = a.title.localeCompare(b.title);
+            const dext = a.ext.localeCompare(b.ext);
+            return (dserno ? dserno : (dtitle ? dtitle : dext));        
+        });
+
+        return seriesBooks;
+    }
+
+    async body(req) {
+        const result = {};
+
+        const query = {
+            series: req.query.series || '',
+            genre: req.query.genre || '',
+            del: '0',
+            
+            all: req.query.all || '',
+            depth: 0,
+        };
+        query.depth = query.series.length + 1;
+
+        if (query.series == '___others') {
+            query.series = '';
+            query.depth = 1;
+            query.others = true;
+        }
+
+        const entry = [];
+        if (query.series && query.series[0] == '=') {
+            //книги по серии
+            const bookList = await this.webWorker.getSeriesBookList(query.series.substring(1));
+
+            if (bookList.books) {
+                let books = bookList.books;
+                const booksAll = this.filterBooks(books);
+                const filtered = (query.all ? booksAll : this.filterBooks(books, query));
+                const sorted = this.sortSeriesBooks(filtered);
+
+                if (booksAll.length > filtered.length) {
+                    entry.push(
+                        this.makeEntry({
+                            id: 'all_series_books',
+                            title: '[Все книги серии]',
+                            link: this.navLink({
+                                href: `/${this.id}?series=${encodeURIComponent(query.series)}&all=1`}),
+                        })
+                    );
+                }
+
+                for (const book of sorted) {
+                    const title = `${book.serno ? `${book.serno}. `: ''}${book.title || 'Без названия'} (${book.ext})`;
+
+                    entry.push(
+                        this.makeEntry({
+                            id: book._uid,
+                            title,
+                            link: this.acqLink({href: `/book?uid=${encodeURIComponent(book._uid)}`}),
+                            content: {
+                                '*ATTRS': {type: 'text'},
+                                '*TEXT': this.bookAuthor(book.author),
+                            },
+                        })
+                    );
+                }
+            }
+        } else {
+            if (query.depth == 1 && !query.genre && !query.others) {
+                entry.push(
+                    this.makeEntry({
+                        id: 'select_genre',
+                        title: '[Выбрать жанр]',
+                        link: this.navLink({href: `/genre?from=${this.id}`}),
+                    })
+                );
+            }
+
+            //навигация по каталогу
+            const queryRes = await this.opdsQuery('series', query, '[Остальные серии]');
+
+            for (const rec of queryRes) {
+                const e = {
+                    id: rec.id,
+                    title: (rec.count ? rec.title : `Серия: ${rec.title}`),
+                    link: this.navLink({href: `/${this.id}?series=${rec.q}&genre=${encodeURIComponent(query.genre)}`}),
+                };
+
+                let countStr = '';
+                if (rec.count)
+                    countStr = `${rec.count} сери${utils.wordEnding(rec.count, 1)}${(query.genre ? ' (в выбранном жанре)' : '')}`;
+                if (!countStr && rec.bookCount && !query.genre)
+                    countStr = `${rec.bookCount} книг${utils.wordEnding(rec.bookCount, 8)}`;
+
+                if (countStr) {
+                    e.content = {
+                        '*ATTRS': {type: 'text'},
+                        '*TEXT': countStr,
+                    };
+                }
+
+                entry.push(this.makeEntry(e));
+            }
+        }
+
+        result.entry = entry;
+        return this.makeBody(result, req);
+    }
+}
+
+module.exports = SeriesPage;

server/core/opds/TitlePage.js

@@ -0,0 +1,98 @@
+const BasePage = require('./BasePage');
+const utils = require('../utils');
+
+class TitlePage extends BasePage {
+    constructor(config) {
+        super(config);
+
+        this.id = 'title';
+        this.title = 'Книги';
+    }
+
+    async body(req) {
+        const result = {};
+
+        const query = {
+            title: req.query.title || '',
+            genre: req.query.genre || '',
+            del: '0',
+            
+            depth: 0,
+        };
+        query.depth = query.title.length + 1;
+
+        if (query.title == '___others') {
+            query.title = '';
+            query.depth = 1;
+            query.others = true;
+        }
+
+        const entry = [];
+        if (query.title && query.title[0] == '=') {
+            //книги по названию
+            const res = await this.webWorker.search('title', query);
+
+            if (res.found.length) {
+                const books = res.found[0].books || [];
+                const filtered = this.filterBooks(books, query);
+
+                for (const book of filtered) {
+                    const title = `${book.serno ? `${book.serno}. `: ''}${book.title || 'Без названия'} (${book.ext})`;
+
+                    entry.push(
+                        this.makeEntry({
+                            id: book._uid,
+                            title,
+                            link: this.acqLink({href: `/book?uid=${encodeURIComponent(book._uid)}`}),
+                            content: {
+                                '*ATTRS': {type: 'text'},
+                                '*TEXT': this.bookAuthor(book.author),
+                            },
+                        })
+                    );
+                }
+            }
+        } else {
+            if (query.depth == 1 && !query.genre && !query.others) {
+                entry.push(
+                    this.makeEntry({
+                        id: 'select_genre',
+                        title: '[Выбрать жанр]',
+                        link: this.navLink({href: `/genre?from=${this.id}`}),
+                    })
+                );
+            }
+
+            //навигация по каталогу
+            const queryRes = await this.opdsQuery('title', query, '[Остальные названия]');
+
+            for (const rec of queryRes) {
+                const e = {
+                    id: rec.id,
+                    title: rec.title,
+                    link: this.navLink({href: `/${this.id}?title=${rec.q}&genre=${encodeURIComponent(query.genre)}`}),
+                };
+
+                let countStr = '';
+                if (rec.count)
+                    countStr = `${rec.count} назван${utils.wordEnding(rec.count, 3)}${(query.genre ? ' (в выбранном жанре)' : '')}`;
+                if (!countStr && rec.bookCount && !query.genre)
+                    countStr = `${rec.bookCount} книг${utils.wordEnding(rec.bookCount, 8)}`;
+
+                if (countStr) {
+                    e.content = {
+                        '*ATTRS': {type: 'text'},
+                        '*TEXT': countStr,
+                    };
+                }
+
+                entry.push(this.makeEntry(e));
+            }
+        }
+
+        result.entry = entry;
+        return this.makeBody(result, req);
+    }
+}
+
+module.exports = TitlePage;

server/core/opds/index.js

@@ -0,0 +1,85 @@
+const basicAuth = require('express-basic-auth');
+
+const RootPage = require('./RootPage');
+const AuthorPage = require('./AuthorPage');
+const SeriesPage = require('./SeriesPage');
+const TitlePage = require('./TitlePage');
+const GenrePage = require('./GenrePage');
+const BookPage = require('./BookPage');
+
+const OpensearchPage = require('./OpensearchPage');
+const SearchPage = require('./SearchPage');
+const SearchHelpPage = require('./SearchHelpPage');
+
+const log = new (require('../AppLogger'))().log;//singleton
+
+module.exports = function(app, config) {
+    if (!config.opds || !config.opds.enabled)
+        return;
+    
+    const opdsRoot = config.opds.root || '/opds';
+    config.opdsRoot = opdsRoot;
+
+    const root = new RootPage(config);
+    const author = new AuthorPage(config);
+    const series = new SeriesPage(config);
+    const title = new TitlePage(config);
+    const genre = new GenrePage(config);
+    const book = new BookPage(config);
+
+    const opensearch = new OpensearchPage(config);
+    const search = new SearchPage(config);
+    const searchHelp = new SearchHelpPage(config);
+
+    const routes = [
+        ['', root],
+        ['/root', root],
+        ['/author', author],
+        ['/series', series],
+        ['/title', title],
+        ['/genre', genre],
+        ['/book', book],
+
+        ['/opensearch', opensearch],
+        ['/search', search],
+        ['/search-help', searchHelp],
+    ];
+
+    const pages = new Map();
+    for (const r of routes) {
+        pages.set(`${opdsRoot}${r[0]}`, r[1]);
+    }
+
+    const opds = async(req, res, next) => {
+        try {
+            const page = pages.get(req.path);
+
+            if (page) {
+                res.set('Content-Type', 'application/atom+xml; charset=utf-8');
+
+                const result = await page.body(req, res);
+
+                if (result !== false)
+                    res.send(result);
+            } else {
+                next();
+            }
+        } catch (e) {
+            log(LM_ERR, `OPDS: ${e.message}, url: ${req.originalUrl}`);
+            res.status(500).send({error: e.message});
+        }
+    };
+
+    const opdsPaths = [opdsRoot, `${opdsRoot}/*`];
+    if (config.opds.password) {
+        if (!config.opds.user)
+            throw new Error('User must not be empty if password set');
+
+        app.use(opdsPaths, basicAuth({
+            users: {[config.opds.user]: config.opds.password},
+            challenge: true,
+        }));
+    }
+    app.get(opdsPaths, opds);
+};
+

server/core/utils.js

@@ -12,7 +12,7 @@ function processLoop() {
 }
 
 function versionText(config) {
-    return `${config.name} v${config.version}, Node.js ${process.version}`;
+    return `${config.name} v${config.version}, Node.js ${process.version}, ${process.platform}`;
 }
 
 async function findFiles(callback, dir, recursive = true) {
@@ -109,8 +109,44 @@ function gzipFile(inputFile, outputFile, level = 1) {
             .pipe(gzip).on('error', reject)
             .pipe(output).on('error', reject)
             .on('finish', (err) => {
+                if (err) reject(err);
+                else resolve();
+            }
+        );
+    });
+}
+
+function gunzipFile(inputFile, outputFile) {
+    return new Promise((resolve, reject) => {
+        const gzip = zlib.createGunzip();
+        const input = fs.createReadStream(inputFile);
+        const output = fs.createWriteStream(outputFile);
+
+        input.on('error', reject)
+            .pipe(gzip).on('error', reject)
+            .pipe(output).on('error', reject)
+            .on('finish', (err) => {
+                if (err) reject(err);
+                else resolve();
+            }
+        );
+    });
+}
+
+function gzipBuffer(buf) {
+    return new Promise((resolve, reject) => {
+        zlib.gzip(buf, {level: 1}, (err, result) => {
             if (err) reject(err);
-            else resolve();
+            resolve(result);
+        });
+    });
+}
+
+function gunzipBuffer(buf) {
+    return new Promise((resolve, reject) => {
+        zlib.gunzip(buf, (err, result) => {
+            if (err) reject(err);
+            resolve(result);
         });
     });
 }
@@ -119,6 +155,47 @@ function toUnixPath(dir) {
     return dir.replace(/\\/g, '/');
 }
 
+function makeValidFileName(fileName, repl = '_') {
+    let f = fileName.replace(/[\x00\\/:*"<>|]/g, repl); // eslint-disable-line no-control-regex
+    f = f.trim();
+    while (f.length && (f[f.length - 1] == '.' || f[f.length - 1] == '_')) {
+        f = f.substring(0, f.length - 1);
+    }
+
+    if (f)
+        return f;
+    else
+        throw new Error('Invalid filename');
+}
+
+function makeValidFileNameOrEmpty(fileName) {
+    try {
+        return makeValidFileName(fileName);
+    } catch(e) {
+        return '';
+    }
+}
+
+function wordEnding(num, type = 0) {
+    const endings = [
+        ['ов', '', 'а', 'а', 'а', 'ов', 'ов', 'ов', 'ов', 'ов'],//0
+        ['й', 'я', 'и', 'и', 'и', 'й', 'й', 'й', 'й', 'й'],//1
+        ['о', '', 'о', 'о', 'о', 'о', 'о', 'о', 'о', 'о'],//2
+        ['ий', 'ие', 'ия', 'ия', 'ия', 'ий', 'ий', 'ий', 'ий', 'ий'],//3
+        ['о', 'а', 'о', 'о', 'о', 'о', 'о', 'о', 'о', 'о'],//4
+        ['ок', 'ка', 'ки', 'ки', 'ки', 'ок', 'ок', 'ок', 'ок', 'ок'],//5
+        ['ых', 'ое', 'ых', 'ых', 'ых', 'ых', 'ых', 'ых', 'ых', 'ых'],//6
+        ['о', 'о', 'о', 'о', 'о', 'о', 'о', 'о', 'о', 'о'],//7
+        ['', 'а', 'и', 'и', 'и', '', '', '', '', ''],//8
+    ];
+    const deci = num % 100;
+    if (deci > 10 && deci < 20) {
+        return endings[type][0];
+    } else {
+        return endings[type][num % 10];
+    }
+}
+
 module.exports = {
     sleep,
     processLoop,
@@ -132,5 +209,11 @@ module.exports = {
     intersectSet,
     randomHexString,
     gzipFile,
+    gunzipFile,
+    gzipBuffer,
+    gunzipBuffer,
     toUnixPath,
+    makeValidFileName,
+    makeValidFileNameOrEmpty,
+    wordEnding,
 };

server/core/xml/ObjectInspector.js

@@ -0,0 +1,105 @@
+class ObjectInspector {
+    constructor(raw = null) {
+        this.raw = raw;
+    }
+
+    narrowSelector(selector) {
+        const result = [];
+        selector = selector.trim();
+        
+        //последний индекс не учитывется, только если не задан явно
+        if (selector && selector[selector.length - 1] == ']')
+            selector += '/';
+
+        const levels = selector.split('/');
+
+        for (const level of levels) {
+            const [name, indexPart] = level.split('[');
+            let index = 0;
+            if (indexPart) {
+                const i = indexPart.indexOf(']');
+                index = parseInt(indexPart.substring(0, i), 10) || 0;
+            }
+
+            result.push({name, index});
+        }
+
+        if (result.length);
+            result[result.length - 1].last = true;
+
+        return result;
+    }
+
+    select(selector = '') {
+        selector = this.narrowSelector(selector);
+
+        let raw = this.raw;
+        for (const s of selector) {
+            if (s.name) {
+                if (typeof(raw) === 'object' && !Array.isArray(raw))
+                    raw = raw[s.name];
+                else
+                    raw = null;
+            }
+
+            if (raw !== null && !s.last) {
+                if (Array.isArray(raw))
+                    raw = raw[s.index];
+                else if (s.index > 0)
+                    raw = null;
+            }
+
+            if (raw === undefined || raw === null) {
+                return [];
+            }
+        }
+
+        raw = (Array.isArray(raw) ? raw : [raw]);
+
+        const result = [];
+        for (const r of raw)
+            result.push(new ObjectInspector(r));
+
+        return result;
+    }
+
+    $$(selector) {
+        return this.select(selector);
+    }
+
+    $(selector) {
+        const res = this.select(selector);
+        return (res !== null && res.length ? res[0] : null);
+    }
+
+    get value() {
+        return this.raw;
+    }
+
+    v(selector = '') {
+        const res = this.$(selector);
+        return (res ? res.value : null);
+    }
+
+    text(selector = '') {
+        const res = this.$(`${selector}/*TEXT`);
+        return (res ? res.value : null);
+    }
+
+    comment(selector = '') {
+        const res = this.$(`${selector}/*COMMENT`);
+        return (res ? res.value : null);
+    }
+
+    cdata(selector = '') {
+        const res = this.$(`${selector}/*CDATA`);
+        return (res ? res.value : null);
+    }
+
+    attrs(selector = '') {
+        const res = this.$(`${selector}/*ATTRS`);
+        return (res ? res.value : null);
+    }
+}
+
+module.exports = ObjectInspector;

server/core/xml/XmlParser.js

@@ -0,0 +1,898 @@
+const sax = require('./sax');
+
+//node types
+const NODE = 1;
+const TEXT = 2;
+const CDATA = 3;
+const COMMENT = 4;
+
+const name2type = {
+    'NODE': NODE,
+    'TEXT': TEXT,
+    'CDATA': CDATA,
+    'COMMENT': COMMENT,
+};
+
+const type2name = {
+    [NODE]: 'NODE',
+    [TEXT]: 'TEXT',
+    [CDATA]: 'CDATA',
+    [COMMENT]: 'COMMENT',
+};
+
+class NodeBase {
+    wideSelector(selectorString) {
+        const result = {all: false, before: false, type: 0, name: ''};
+
+        if (selectorString === '') {
+            result.before = true;
+        } else if (selectorString === '*') {
+            result.all = true;        
+        } else if (selectorString[0] === '*') {
+            const typeName = selectorString.substring(1);
+            result.type = name2type[typeName];
+            if (!result.type)
+                throw new Error(`Unknown selector type: ${typeName}`);
+        } else {
+            result.name = selectorString;
+        }
+
+        return result;
+    }
+
+    checkNode(rawNode, selectorObj) {
+        return selectorObj.all || selectorObj.before
+            || (selectorObj.type && rawNode[0] === selectorObj.type)
+            || (rawNode[0] === NODE && rawNode[1] === selectorObj.name);
+    }
+
+    findNodeIndex(nodes, selectorObj) {
+        for (let i = 0; i < nodes.length; i++)
+            if (this.checkNode(nodes[i], selectorObj))
+                return i;
+    }
+
+    rawAdd(nodes, rawNode, selectorObj) {
+        if (selectorObj.all) {
+            nodes.push(rawNode);
+        } else if (selectorObj.before) {
+            nodes.unshift(rawNode);
+        } else {
+            const index = this.findNodeIndex(nodes, selectorObj);
+            if (index >= 0)
+                nodes.splice(index, 0, rawNode);
+            else 
+                nodes.push(rawNode);
+        }
+    }
+
+    rawRemove(nodes, selectorObj) {
+        if (selectorObj.before)
+            return;
+
+        for (let i = nodes.length - 1; i >= 0; i--) {
+            if (this.checkNode(nodes[i], selectorObj))
+                nodes.splice(i, 1);
+        }
+    }
+}
+
+class NodeObject extends NodeBase {
+    constructor(raw = null) {
+        super();
+
+        if (raw)
+            this.raw = raw;
+        else
+            this.raw = [];
+    }
+
+    get type() {
+        return this.raw[0] || null;
+    }
+
+    get name() {
+        if (this.type === NODE)
+            return this.raw[1] || null;
+
+        return null;
+    }
+
+    set name(value) {
+        if (this.type === NODE)
+            this.raw[1] = value;
+    }
+
+    attrs(key, value) {
+        if (this.type !== NODE)
+            return null;
+
+        let map = null;
+
+        if (key instanceof Map) {
+            map = key;
+            this.raw[2] = Array.from(map);
+        } else if (Array.isArray(this.raw[2])) {
+            map = new Map(this.raw[2]);
+            if (key) {
+                map.set(key, value);
+                this.raw[2] = Array.from(map);
+            }
+        }
+
+        return map;
+    }
+
+    get value() {
+        switch (this.type) {
+            case NODE:
+                return this.raw[3] || null;
+            case TEXT:
+            case CDATA:
+            case COMMENT:
+                return this.raw[1] || null;
+        }
+
+        return null;
+    }
+
+    set value(v) {
+        switch (this.type) {
+            case NODE:
+                this.raw[3] = v;
+                break;
+            case TEXT:
+            case CDATA:
+            case COMMENT:
+                this.raw[1] = v;
+        }
+    }
+
+    add(node, after = '*') {
+        if (this.type !== NODE)
+            return;
+
+        const selectorObj = this.wideSelector(after);
+
+        if (!Array.isArray(this.raw[3]))
+            this.raw[3] = [];
+
+        if (Array.isArray(node)) {
+            for (const node_ of node)
+                this.rawAdd(this.raw[3], node_.raw, selectorObj);
+        } else {
+            this.rawAdd(this.raw[3], node.raw, selectorObj);
+        }
+
+        return this;
+    }
+
+    remove(selector = '') {
+        if (this.type !== NODE || !this.raw[3])
+            return;
+
+        const selectorObj = this.wideSelector(selector);
+
+        this.rawRemove(this.raw[3], selectorObj);
+        if (!this.raw[3].length)
+            this.raw[3] = null;
+
+        return this;
+    }
+
+    each(callback) {
+        if (this.type !== NODE || !this.raw[3])
+            return;
+
+        for (const n of this.raw[3]) {
+            if (callback(new NodeObject(n)) === false)
+                break;
+        }
+
+        return this;
+    }
+
+    eachDeep(callback) {
+        if (this.type !== NODE || !this.raw[3])
+            return;
+
+        const deep = (nodes, route = '') => {
+            for (const n of nodes) {
+                const node = new NodeObject(n);
+
+                if (callback(node, route) === false)
+                    return false;
+
+                if (node.type === NODE && node.value) {
+                    if (deep(node.value, `${route}${route ? '/' : ''}${node.name}`) === false)
+                        return false;
+                }
+            }
+        }
+
+        deep(this.raw[3]);
+
+        return this;
+    }
+}
+
+class XmlParser extends NodeBase {
+    constructor(rawNodes = []) {
+        super();
+
+        this.NODE = NODE;
+        this.TEXT = TEXT;
+        this.CDATA = CDATA;
+        this.COMMENT = COMMENT;
+
+        this.rawNodes = rawNodes;
+    }
+
+    get count() {
+        return this.rawNodes.length;
+    }
+
+    get nodes() {
+        const result = [];
+        for (const n of this.rawNodes)
+            result.push(new NodeObject(n));
+
+        return result;
+    }
+
+    nodeObject(node) {
+        return new NodeObject(node);
+    }
+
+    newParser(nodes) {
+        return new XmlParser(nodes);
+    }
+
+    checkType(type) {
+        if (!type2name[type])
+            throw new Error(`Invalid type: ${type}`);
+    }
+
+    createTypedNode(type, nameOrValue, attrs = null, value = null) {
+        this.checkType(type);
+        switch (type) {
+            case NODE:
+                if (!nameOrValue || typeof(nameOrValue) !== 'string')
+                    throw new Error('Node name must be non-empty string');
+                return new NodeObject([type, nameOrValue, attrs, value]);
+            case TEXT:
+            case CDATA:
+            case COMMENT:
+                if (typeof(nameOrValue) !== 'string')
+                    throw new Error('Node value must be of type string');
+                return new NodeObject([type, nameOrValue]);
+        }
+    }
+
+    createNode(name, attrs = null, value = null) {
+        return this.createTypedNode(NODE, name, attrs, value);
+    }
+
+    createText(value = null) {
+        return this.createTypedNode(TEXT, value);
+    }
+
+    createCdata(value = null) {
+        return this.createTypedNode(CDATA, value);
+    }
+
+    createComment(value = null) {
+        return this.createTypedNode(COMMENT, value);
+    }
+
+    add(node, after = '*') {
+        const selectorObj = this.wideSelector(after);
+
+        for (const n of this.rawNodes) {
+            if (n && n[0] === NODE) {
+                if (!Array.isArray(n[3]))
+                    n[3] = [];
+                
+                if (Array.isArray(node)) {
+                    for (const node_ of node)
+                        this.rawAdd(n[3], node_.raw, selectorObj);
+                } else {
+                    this.rawAdd(n[3], node.raw, selectorObj);
+                }
+            }
+        }
+
+        return this;
+    }
+
+    addRoot(node, after = '*') {
+        const selectorObj = this.wideSelector(after);
+
+        if (Array.isArray(node)) {
+            for (const node_ of node)
+                this.rawAdd(this.rawNodes, node_.raw, selectorObj);
+        } else {
+            this.rawAdd(this.rawNodes, node.raw, selectorObj);
+        }
+
+        return this;
+    }
+
+    remove(selector = '') {
+        const selectorObj = this.wideSelector(selector);
+
+        for (const n of this.rawNodes) {
+            if (n && n[0] === NODE && Array.isArray(n[3])) {
+                this.rawRemove(n[3], selectorObj);
+                if (!n[3].length)
+                    n[3] = null;
+            }
+        }
+
+        return this;
+    }
+
+    removeRoot(selector = '') {
+        const selectorObj = this.wideSelector(selector);
+
+        this.rawRemove(this.rawNodes, selectorObj);
+
+        return this;
+    }
+
+    each(callback, self = false) {
+        if (self) {
+            for (const n of this.rawNodes) {
+                if (callback(new NodeObject(n)) === false)
+                    return this;
+            }
+        } else {
+            for (const n of this.rawNodes) {
+                if (n[0] === NODE && n[3]) {
+                    for (const nn of n[3])
+                        if (callback(new NodeObject(nn)) === false)
+                            return this;
+                }
+            }
+        }
+
+        return this;
+    }
+
+    eachSelf(callback) {
+        return this.each(callback, true);
+    }
+
+    eachDeep(callback, self = false) {
+        const deep = (nodes, route = '') => {
+            for (const n of nodes) {
+                const node = new NodeObject(n);
+
+                if (callback(node, route) === false)
+                    return false;
+
+                if (node.type === NODE && node.value) {
+                    if (deep(node.value, `${route}${route ? '/' : ''}${node.name}`) === false)
+                        return false;
+                }
+            }
+        }
+
+        if (self) {
+            deep(this.rawNodes);
+        } else {
+            for (const n of this.rawNodes) {
+                if (n[0] === NODE && n[3])
+                    if (deep(n[3]) === false)
+                        break;
+            }
+        }
+
+        return this;
+    }
+
+    eachDeepSelf(callback) {
+        return this.eachDeep(callback, true);
+    }
+
+    rawSelect(nodes, selectorObj, callback) {
+        for (const n of nodes)
+            if (this.checkNode(n, selectorObj))
+                callback(n);
+
+        return this;
+    }
+
+    select(selector = '', self = false) {
+        let newRawNodes = [];
+
+        if (selector.indexOf('/') >= 0) {
+            const selectors = selector.split('/');
+            let res = this;
+            for (const sel of selectors) {
+                res = res.select(sel, self);
+                self = false;
+            }
+
+            newRawNodes = res.rawNodes;
+        } else {
+            const selectorObj = this.wideSelector(selector);
+
+            if (self) {
+                this.rawSelect(this.rawNodes, selectorObj, (node) => {
+                    newRawNodes.push(node);
+                })
+            } else {
+                for (const n of this.rawNodes) {
+                    if (n && n[0] === NODE && Array.isArray(n[3])) {
+                        this.rawSelect(n[3], selectorObj, (node) => {
+                            newRawNodes.push(node);
+                        })
+                    }
+                }
+            }
+        }
+
+        return new XmlParser(newRawNodes);
+    }
+
+    selectSelf(selector) {
+        return this.select(selector, true);
+    }
+
+    selectFirst(selector, self) {
+        const result = this.select(selector, self);
+        const node = (result.count ? result.rawNodes[0] : null);
+        return new NodeObject(node);
+    }
+
+    selectFirstSelf(selector) {
+        return this.selectFirst(selector, true);
+    }
+
+    toJson(options = {}) {
+        const {format = false} = options;
+
+        if (format)
+            return JSON.stringify(this.rawNodes, null, 2);
+        else
+            return JSON.stringify(this.rawNodes);
+    }
+
+    fromJson(jsonString) {
+        const parsed = JSON.parse(jsonString);
+        if (!Array.isArray(parsed))
+            throw new Error('JSON parse error: root element must be array');
+
+        this.rawNodes = parsed;
+
+        return this;
+    }
+
+    toString(options = {}) {
+        const {
+            encoding = 'utf-8',
+            format = false,
+            noHeader = false,
+            expandEmpty = false
+        } = options;
+
+        let deepType = 0;
+        let out = '';
+        if (!noHeader)
+            out += `<?xml version="1.0" encoding="${encoding}"?>`;
+
+        const nodesToString = (nodes, depth = 0) => {
+            let result = '';
+
+            const indent = '\n' + ' '.repeat(depth);
+            let lastType = 0;
+
+            for (const n of nodes) {
+                const node = new NodeObject(n);
+
+                let open = '';
+                let body = '';
+                let close = '';
+
+                if (node.type === NODE) {
+                    if (!node.name)
+                        continue;
+
+                    let attrs = '';
+
+                    const nodeAttrs = node.attrs();
+                    if (nodeAttrs) {
+                        for (const [attrName, attrValue] of nodeAttrs) {
+                            if (typeof(attrValue) === 'string')
+                                attrs += ` ${attrName}="${attrValue}"`;
+                            else
+                                if (attrValue)
+                                    attrs += ` ${attrName}`;
+                        }
+                    }
+
+                    if (node.value)
+                        body = nodesToString(node.value, depth + 2);
+
+                    if (!body && !expandEmpty) {
+                        open = (format && lastType !== TEXT ? indent : '');
+                        open += `<${node.name}${attrs}/>`;
+                    } else {
+                        open = (format && lastType !== TEXT ? indent : '');
+                        open += `<${node.name}${attrs}>`;
+
+                        close = (format && deepType && deepType !== TEXT ? indent : '');
+                        close += `</${node.name}>`;
+                    }
+                } else if (node.type === TEXT) {
+                    body = node.value || '';
+                } else if (node.type === CDATA) {
+                    body = (format && lastType !== TEXT ? indent : '');
+                    body += `<![CDATA[${node.value || ''}]]>`;
+                } else if (node.type === COMMENT) {
+                    body = (format && lastType !== TEXT ? indent : '');
+                    body += `<!--${node.value || ''}-->`;
+                }
+
+                result += `${open}${body}${close}`;
+                lastType = node.type;
+            }
+
+            deepType = lastType;
+            return result;
+        }
+
+        out += nodesToString(this.rawNodes) + (format ? '\n' : '');
+
+        return out;
+    }
+
+    fromString(xmlString, options = {}) {
+        const {
+            lowerCase = false,
+            whiteSpace = false,
+            pickNode = false,
+        } = options;
+
+        const parsed = [];
+        const root = this.createNode('root', null, parsed);//fake node
+        let node = root;
+
+        let route = '';
+        let routeStack = [];
+        let ignoreNode = false;
+
+        const onStartNode = (tag, tail, singleTag, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
+            if (tag == '?xml')
+                return;
+
+            if (!ignoreNode && pickNode) {
+                route += `${route ? '/' : ''}${tag}`;
+                ignoreNode = !pickNode(route);
+            }
+
+            let newNode = node;
+            if (!ignoreNode)
+                newNode = this.createNode(tag);
+
+            routeStack.push({tag, route, ignoreNode, node: newNode});
+
+            if (ignoreNode)
+                return;
+
+            if (tail && tail.trim() !== '') {
+                const parsedAttrs = sax.getAttrsSync(tail, lowerCase);
+                const attrs = new Map();
+                for (const attr of parsedAttrs.values()) {
+                    attrs.set(attr.fn, attr.value);
+                }
+
+                if (attrs.size)
+                    newNode.attrs(attrs);
+            }
+
+            if (!node.value)
+                node.value = [];
+            node.value.push(newNode.raw);
+            node = newNode;
+        };
+
+        const onEndNode = (tag, tail, singleTag, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
+            if (routeStack.length && routeStack[routeStack.length - 1].tag === tag) {
+                routeStack.pop();
+
+                if (routeStack.length) {
+                    const last = routeStack[routeStack.length - 1];
+                    route = last.route;
+                    ignoreNode = last.ignoreNode;
+                    node = last.node;
+                } else {
+                    route = '';
+                    ignoreNode = false;
+                    node = root;
+                }
+            }
+        }
+
+        const onTextNode = (text, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
+            if (ignoreNode || (pickNode && !pickNode(`${route}/*TEXT`)))
+                return;
+
+            if (!whiteSpace && text.trim() == '')
+                return;
+
+            if (!node.value)
+                node.value = [];
+
+            node.value.push(this.createText(text).raw);
+        };
+
+        const onCdata = (tagData, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
+            if (ignoreNode || (pickNode && !pickNode(`${route}/*CDATA`)))
+                return;
+
+            if (!node.value)
+                node.value = [];
+
+            node.value.push(this.createCdata(tagData).raw);
+        }
+
+        const onComment = (tagData, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
+            if (ignoreNode || (pickNode && !pickNode(`${route}/*COMMENT`)))
+                return;
+
+            if (!node.value)
+                node.value = [];
+
+            node.value.push(this.createComment(tagData).raw);
+        }
+
+        sax.parseSync(xmlString, {
+            onStartNode, onEndNode, onTextNode, onCdata, onComment, lowerCase
+        });
+
+        this.rawNodes = parsed;
+
+        return this;
+    }
+
+    toObject(options = {}) {
+        const {
+            compactText = false
+        } = options;
+
+        const nodesToObject = (nodes) => {
+            const result = {};
+
+            for (const n of nodes) {
+                const node = new NodeObject(n);
+
+                if (node.type === NODE) {
+                    if (!node.name)
+                        continue;
+
+                    let newNode = {};
+
+                    const nodeAttrs = node.attrs();
+                    if (nodeAttrs)
+                        newNode['*ATTRS'] = Object.fromEntries(nodeAttrs);
+
+                    if (node.value) {
+                        Object.assign(newNode, nodesToObject(node.value));
+
+                        //схлопывание текстового узла до string
+                        if (compactText
+                            && !Array.isArray(newNode)
+                            && Object.prototype.hasOwnProperty.call(newNode, '*TEXT')
+                            && Object.keys(newNode).length === 1) {
+                            newNode = newNode['*TEXT'];
+                        }
+                    }
+
+                    if (!Object.prototype.hasOwnProperty.call(result, node.name)) {
+                        result[node.name] = newNode;
+                    } else {
+                        if (!Array.isArray(result[node.name])) {
+                            result[node.name] = [result[node.name]];
+                        }
+
+                        result[node.name].push(newNode);
+                    }
+                } else if (node.type === TEXT) {
+                    if (!result['*TEXT'])
+                        result['*TEXT'] = '';
+                    result['*TEXT'] += node.value || '';
+                } else if (node.type === CDATA) {
+                    if (!result['*CDATA'])
+                        result['*CDATA'] = '';
+                    result['*CDATA'] += node.value || '';
+                } else if (node.type === COMMENT) {
+                    if (!result['*COMMENT'])
+                        result['*COMMENT'] = '';
+                    result['*COMMENT'] += node.value || '';
+                }
+            }
+
+            return result;
+        }
+
+        return nodesToObject(this.rawNodes);
+    }
+
+    fromObject(xmlObject) {
+        const objectToNodes = (obj) => {
+            const result = [];
+
+            for (const [tag, objNode] of Object.entries(obj)) {
+                if (tag === '*TEXT') {
+                    result.push(this.createText(objNode).raw);
+                } else if (tag === '*CDATA') {
+                    result.push(this.createCdata(objNode).raw);
+                } else if (tag === '*COMMENT') {
+                    result.push(this.createComment(objNode).raw);
+                } else if (tag === '*ATTRS') {
+                    //пропускаем
+                } else {
+                    if (typeof(objNode) === 'string' || typeof(objNode) === 'number') {
+                        result.push(this.createNode(tag, null, [this.createText(objNode.toString()).raw]).raw);
+                    } else if (Array.isArray(objNode)) {
+                        for (const n of objNode) {
+                            if (typeof(n) === 'string') {
+                                result.push(this.createNode(tag, null, [this.createText(n).raw]).raw);
+                            } else if (typeof(n) === 'object') {
+                                result.push(this.createNode(tag, (n['*ATTRS'] ? Object.entries(n['*ATTRS']) : null), objectToNodes(n)).raw);
+                            }
+                        }
+
+                    } else if (typeof(objNode) === 'object') {
+                        result.push(this.createNode(tag, (objNode['*ATTRS'] ? Object.entries(objNode['*ATTRS']) : null), objectToNodes(objNode)).raw);
+                    } else {
+                        throw new Error(`Unknown node type "${typeof(objNode)}" of node: ${objNode}`);
+                    }
+                }
+            }
+
+            return result;
+        };
+
+        this.rawNodes = objectToNodes(xmlObject);
+
+        return this;
+    }
+
+    // XML Inspector start
+    narrowSelector(selector) {
+        const result = [];
+        selector = selector.trim();
+        
+        //последний индекс не учитывется, только если не задан явно
+        if (selector && selector[selector.length - 1] == ']')
+            selector += '/';
+
+        const levels = selector.split('/');
+
+        for (const level of levels) {
+            const [name, indexPart] = level.split('[');
+            let index = 0;
+            if (indexPart) {
+                const i = indexPart.indexOf(']');
+                index = parseInt(indexPart.substring(0, i), 10) || 0;
+            }
+
+            let type = NODE;
+            if (name[0] === '*') {
+                const typeName = name.substring(1);
+                type = name2type[typeName];
+                if (!type)
+                    throw new Error(`Unknown selector type: ${typeName}`);
+            }
+
+            result.push({type, name, index});
+        }
+
+        if (result.length);
+            result[result.length - 1].last = true;
+
+        return result;
+    }
+
+    inspect(selector = '') {
+        selector = this.narrowSelector(selector);
+
+        let raw = this.rawNodes;
+        for (const s of selector) {
+            if (s.name) {
+                let found = [];
+                for (const n of raw) {
+                    if (n[0] === s.type && (n[0] !== NODE || s.name === '*NODE' || n[1] === s.name)) {
+                        found.push(n);
+
+                        if (found.length > s.index && !s.last)
+                            break;
+                    }
+                }
+
+                raw = found;
+            }
+
+            if (raw.length && !s.last) {
+                if (s.index < raw.length) {
+                    raw = raw[s.index];
+                    if (raw[0] === NODE && raw[3])
+                        raw = raw[3];
+                    else {
+                        raw = [];
+                        break;
+                    }
+                } else {
+                    raw = [];
+                    break;
+                }
+            }
+        }
+
+        return new XmlParser(raw);
+    }
+
+    $$(selector) {
+        return this.inspect(selector);
+    }
+
+    $$array(selector) {
+        const res = this.inspect(selector);
+        const result = [];
+        for (const n of res.rawNodes)
+            if (n[0] === NODE)
+                result.push(new XmlParser([n]));
+
+        return result;
+    }
+
+    $(selector) {
+        const res = this.inspect(selector);
+        const node = (res.count ? res.rawNodes[0] : null);
+        return new NodeObject(node);
+    }
+
+    v(selector = '') {
+        const res = this.$(selector);
+        return (res.type ? res.value : null);
+    }
+
+    text(selector = '') {
+        const res = this.$(`${selector}/*TEXT`);
+        return (res.type === TEXT ? res.value : null);
+    }
+
+    comment(selector = '') {
+        const res = this.$(`${selector}/*COMMENT`);
+        return (res.type === COMMENT ? res.value : null);
+    }
+
+    cdata(selector = '') {
+        const res = this.$(`${selector}/*CDATA`);
+        return (res.type === CDATA ? res.value : null);
+    }
+
+    concat(selector = '') {
+        const res = this.$$(selector);
+        const out = [];
+        for (const n of res.rawNodes) {
+            const node = new NodeObject(n);
+            if (node.type && node.type !== NODE)
+                out.push(node.value);
+        }
+
+        return (out.length ? out.join('') : null);
+    }
+
+    attrs(selector = '') {
+        const res = this.$(selector);
+        const attrs = res.attrs();
+        return (res.type === NODE && attrs ? Object.fromEntries(attrs) : null);
+    }
+    // XML Inspector finish
+}
+
+module.exports = XmlParser;

server/core/xml/sax.js

@@ -0,0 +1,367 @@
+function parseSync(xstr, options) {
+    const dummy = () => {};
+    let {onStartNode: _onStartNode = dummy,
+        onEndNode: _onEndNode = dummy,
+        onTextNode: _onTextNode = dummy,
+        onCdata: _onCdata = dummy,
+        onComment: _onComment = dummy,
+        onProgress: _onProgress = dummy,
+        innerCut = new Set(),
+        lowerCase = true,
+    } = options;
+
+    let i = 0;
+    const len = xstr.length;
+    const progStep = len/20;
+    let nextProg = 0;
+
+    let cutCounter = 0;
+    let cutTag = '';
+    let inCdata;
+    let inComment;
+    let leftData = 0;
+    while (i < len) {
+        inCdata = false;
+        inComment = false;
+        let singleTag = false;
+
+        let left = xstr.indexOf('<', i);
+        if (left < 0)
+            break;
+        leftData = left;
+
+        if (left < len - 2 && xstr[left + 1] == '!') {
+            if (xstr[left + 2] == '-') {
+                const leftComment = xstr.indexOf('<!--', left);
+                if (leftComment == left) {
+                    inComment = true;
+                    leftData = left + 3;
+                }
+            }
+
+            if (!inComment && xstr[left + 2] == '[') {
+                const leftCdata = xstr.indexOf('<![CDATA[', left);
+                if (leftCdata == left) {
+                    inCdata = true;
+                    leftData = left + 8;
+                }
+            }
+        }
+
+        if (left != i) {
+            const text = xstr.substr(i, left - i);
+            _onTextNode(text, cutCounter, cutTag);
+        }
+
+        let right = null;
+        let rightData = null;
+        if (inCdata) {
+            rightData = xstr.indexOf(']]>', leftData + 1);
+            if (rightData < 0)
+                break;
+            right = rightData + 2;
+        } else if (inComment) {
+            rightData = xstr.indexOf('-->', leftData + 1);
+            if (rightData < 0)
+                break;
+            right = rightData + 2;
+        } else {
+            rightData = xstr.indexOf('>', leftData + 1);
+            if (rightData < 0)
+                break;
+            right = rightData;
+            if (xstr[right - 1] === '/') {
+                singleTag = true;
+                rightData--;
+            }
+        }
+
+        let tagData = xstr.substr(leftData + 1, rightData - leftData - 1);
+
+        if (inCdata) {
+            _onCdata(tagData, cutCounter, cutTag);
+        } else if (inComment) {
+            _onComment(tagData, cutCounter, cutTag);
+        } else {
+            let tag = '';
+            let tail = '';
+            const firstSpace = tagData.indexOf(' ');
+            if (firstSpace >= 0) {
+                tail = tagData.substr(firstSpace);
+                tag = tagData.substr(0, firstSpace);
+            } else {
+                tag = tagData;
+            }
+            if (lowerCase)
+                tag = tag.toLowerCase();
+
+            if (innerCut.has(tag) && (!cutCounter || cutTag === tag)) {
+                if (!cutCounter)
+                    cutTag = tag;
+                cutCounter++;
+            }
+
+            let endTag = (singleTag ? tag : '');
+            if (tag === '' || tag[0] !== '/') {
+                _onStartNode(tag, tail, singleTag, cutCounter, cutTag);
+            } else {
+                endTag = tag.substr(1);
+            }
+
+            if (endTag)
+                _onEndNode(endTag, tail, singleTag, cutCounter, cutTag);
+
+            if (cutTag === endTag) {
+                cutCounter = (cutCounter > 0 ? cutCounter - 1 : 0);
+                if (!cutCounter)
+                    cutTag = '';
+            }
+        }
+
+        if (right >= nextProg) {
+            _onProgress(Math.round(right/(len + 1)*100));
+            nextProg += progStep;
+        }
+        i = right + 1;
+    }
+
+    if (i < len) {
+        if (inCdata) {
+            _onCdata(xstr.substr(leftData + 1, len - leftData - 1), cutCounter, cutTag);
+        } else if (inComment) {
+            _onComment(xstr.substr(leftData + 1, len - leftData - 1), cutCounter, cutTag);
+        } else {
+            _onTextNode(xstr.substr(i, len - i), cutCounter, cutTag);
+        }
+    }
+
+    _onProgress(100);
+}
+
+//асинхронная копия parseSync
+//делается заменой "_on" => "await _on" после while
+async function parse(xstr, options) {
+    const dummy = () => {};
+    let {onStartNode: _onStartNode = dummy,
+        onEndNode: _onEndNode = dummy,
+        onTextNode: _onTextNode = dummy,
+        onCdata: _onCdata = dummy,
+        onComment: _onComment = dummy,
+        onProgress: _onProgress = dummy,
+        innerCut = new Set(),
+        lowerCase = true,
+    } = options;
+
+    let i = 0;
+    const len = xstr.length;
+    const progStep = len/20;
+    let nextProg = 0;
+
+    let cutCounter = 0;
+    let cutTag = '';
+    let inCdata;
+    let inComment;
+    let leftData = 0;
+    while (i < len) {
+        inCdata = false;
+        inComment = false;
+        let singleTag = false;
+
+        let left = xstr.indexOf('<', i);
+        if (left < 0)
+            break;
+        leftData = left;
+
+        if (left < len - 2 && xstr[left + 1] == '!') {
+            if (xstr[left + 2] == '-') {
+                const leftComment = xstr.indexOf('<!--', left);
+                if (leftComment == left) {
+                    inComment = true;
+                    leftData = left + 3;
+                }
+            }
+
+            if (!inComment && xstr[left + 2] == '[') {
+                const leftCdata = xstr.indexOf('<![CDATA[', left);
+                if (leftCdata == left) {
+                    inCdata = true;
+                    leftData = left + 8;
+                }
+            }
+        }
+
+        if (left != i) {
+            const text = xstr.substr(i, left - i);
+            await _onTextNode(text, cutCounter, cutTag);
+        }
+
+        let right = null;
+        let rightData = null;
+        if (inCdata) {
+            rightData = xstr.indexOf(']]>', leftData + 1);
+            if (rightData < 0)
+                break;
+            right = rightData + 2;
+        } else if (inComment) {
+            rightData = xstr.indexOf('-->', leftData + 1);
+            if (rightData < 0)
+                break;
+            right = rightData + 2;
+        } else {
+            rightData = xstr.indexOf('>', leftData + 1);
+            if (rightData < 0)
+                break;
+            right = rightData;
+            if (xstr[right - 1] === '/') {
+                singleTag = true;
+                rightData--;
+            }
+        }
+
+        let tagData = xstr.substr(leftData + 1, rightData - leftData - 1);
+
+        if (inCdata) {
+            await _onCdata(tagData, cutCounter, cutTag);
+        } else if (inComment) {
+            await _onComment(tagData, cutCounter, cutTag);
+        } else {
+            let tag = '';
+            let tail = '';
+            const firstSpace = tagData.indexOf(' ');
+            if (firstSpace >= 0) {
+                tail = tagData.substr(firstSpace);
+                tag = tagData.substr(0, firstSpace);
+            } else {
+                tag = tagData;
+            }
+            if (lowerCase)
+                tag = tag.toLowerCase();
+
+            if (innerCut.has(tag) && (!cutCounter || cutTag === tag)) {
+                if (!cutCounter)
+                    cutTag = tag;
+                cutCounter++;
+            }
+
+            let endTag = (singleTag ? tag : '');
+            if (tag === '' || tag[0] !== '/') {
+                await _onStartNode(tag, tail, singleTag, cutCounter, cutTag);
+            } else {
+                endTag = tag.substr(1);
+            }
+
+            if (endTag)
+                await _onEndNode(endTag, tail, singleTag, cutCounter, cutTag);
+
+            if (cutTag === endTag) {
+                cutCounter = (cutCounter > 0 ? cutCounter - 1 : 0);
+                if (!cutCounter)
+                    cutTag = '';
+            }
+        }
+
+        if (right >= nextProg) {
+            await _onProgress(Math.round(right/(len + 1)*100));
+            nextProg += progStep;
+        }
+        i = right + 1;
+    }
+
+    if (i < len) {
+        if (inCdata) {
+            await _onCdata(xstr.substr(leftData + 1, len - leftData - 1), cutCounter, cutTag);
+        } else if (inComment) {
+            await _onComment(xstr.substr(leftData + 1, len - leftData - 1), cutCounter, cutTag);
+        } else {
+            await _onTextNode(xstr.substr(i, len - i), cutCounter, cutTag);
+        }
+    }
+
+    await _onProgress(100);
+}
+
+function getAttrsSync(tail, lowerCase = true) {
+    let result = new Map();
+    let name = '';    
+    let value = '';
+    let vOpen = '';
+    let inName = false;
+    let inValue = false;
+    let waitValue = false;
+    let waitEq = true;
+
+    const pushResult = () => {
+        if (waitEq)
+            value = true;
+        if (lowerCase)
+            name = name.toLowerCase();
+        if (name != '') {
+            const fn = name;
+            let ns = '';
+            if (fn.indexOf(':') >= 0) {
+                [ns, name] = fn.split(':');
+            }
+
+            result.set(fn, {value, ns, name, fn});
+        }
+        name = '';
+        value = '';
+        vOpen = '';
+        inName = false;
+        inValue = false;
+        waitValue = false;
+        waitEq = true;
+    };
+
+    tail = tail.replace(/[\t\n\r]/g, ' ');
+    for (let i = 0; i < tail.length; i++) {
+        const c = tail.charAt(i);
+        if (c == ' ') {
+            if (inValue) {
+                if (vOpen == '"')
+                    value += c;
+                else
+                    pushResult();
+            } else if (inName) {
+                inName = false;
+            }
+        } else if (!inValue && c == '=') {
+            waitEq = false;
+            waitValue = true;
+            inName = false;
+        } else if (c == '"') {
+            if (inValue) {
+                pushResult();
+            } else if (waitValue) {
+                inValue = true;
+                vOpen = '"';
+            }
+        } else if (inValue) {
+            value += c;
+        } else if (inName) {
+            name += c;
+        } else if (waitEq) {
+            pushResult();
+            inName = true;
+            name = c;
+        } else if (waitValue) {
+            waitValue = false;
+            inValue = true;
+            vOpen = ' ';
+            value = c;
+        } else {
+            inName = true;
+            name = c;
+        }
+    }
+    if (name != '')
+        pushResult();
+
+    return result;
+}
+
+module.exports = {
+    parseSync,
+    getAttrsSync,
+    parse
+}

server/createWebApp.js

@@ -9,7 +9,7 @@ module.exports = async(config) => {
 
     if (await fs.pathExists(verFile)) {
         const curPublicVersion = await fs.readFile(verFile, 'utf8');
-        if (curPublicVersion == config.version)
+        if (curPublicVersion == config.version + config.rootPathStatic)
             return;
     }
 
@@ -26,6 +26,6 @@ module.exports = async(config) => {
         await zipReader.close();
     }
 
-    await fs.writeFile(verFile, config.version);
+    await fs.writeFile(verFile, config.version + config.rootPathStatic);
     await fs.remove(zipFile);
 };

server/index.js

@@ -16,16 +16,16 @@ let branch = '';
 const argvStrings = ['host', 'port', 'app-dir', 'lib-dir', 'inpx'];
 
 function showHelp(defaultConfig) {
-    console.log(utils.versionText(config));
+    console.log(utils.versionText(defaultConfig));
     console.log(
-`Usage: ${config.name} [options]
+`Usage: ${defaultConfig.name} [options]
 
 Options:
-  --help              Print ${config.name} command line options
+  --help              Print ${defaultConfig.name} command line options
   --host=<ip>         Set web server host, default: ${defaultConfig.server.host}
   --port=<port>       Set web server port, default: ${defaultConfig.server.port}
-  --app-dir=<dirpath> Set application working directory, default: <execDir>/.${config.name}
-  --lib-dir=<dirpath> Set library directory, default: the same as ${config.name} executable's
+  --app-dir=<dirpath> Set application working directory, default: <execDir>/.${defaultConfig.name}
+  --lib-dir=<dirpath> Set library directory, default: the same as ${defaultConfig.name} executable's
   --inpx=<filepath>   Set INPX collection file, default: the one that found in library dir
   --recreate          Force recreation of the search database on start
 `
@@ -50,13 +50,14 @@ async function init() {
     config.logDir = `${config.dataDir}/log`;
     config.publicDir = `${config.dataDir}/public`;
     config.publicFilesDir = `${config.dataDir}/public-files`;
-    config.filesPathStatic = `/book`;
-    config.filesDir = `${config.publicFilesDir}${config.filesPathStatic}`;
+    config.rootPathStatic = config.server.root || '';
+    config.bookPathStatic = `${config.rootPathStatic}/book`;
+    config.bookDir = `${config.publicFilesDir}/book`;
 
     configManager.config = config;
 
     await fs.ensureDir(config.dataDir);
-    await fs.ensureDir(config.filesDir);
+    await fs.ensureDir(config.bookDir);
     await fs.ensureDir(config.tempDir);
     await fs.emptyDir(config.tempDir);
 
@@ -83,7 +84,7 @@ async function init() {
     }
 
     if (!config.remoteLib) {
-        const libDir = argv['lib-dir'];
+        const libDir = argv['lib-dir'] || config.libDir;
         if (libDir) {
             if (await fs.pathExists(libDir)) {
                 config.libDir = libDir;
@@ -94,11 +95,12 @@ async function init() {
             config.libDir = config.execDir;
         }
 
-        if (argv.inpx) {
-            if (await fs.pathExists(argv.inpx)) {
-                config.inpxFile = argv.inpx;
+        const inpxFile = argv.inpx || config.inpx;
+        if (inpxFile) {
+            if (await fs.pathExists(inpxFile)) {
+                config.inpxFile = inpxFile;
             } else {
-                throw new Error(`File "${argv.inpx}" not found`);
+                throw new Error(`File "${inpxFile}" not found`);
             }
         } else {
             const inpxFiles = [];
@@ -154,10 +156,17 @@ async function main() {
     if (devModule)
         devModule.logQueries(app);
 
+    const opds = require('./core/opds');
+    opds(app, config);
+
+    const initStatic = require('./static');
     initStatic(app, config);
     
+    const webAccess = new (require('./core/WebAccess'))(config);
+    await webAccess.init();
+
     const { WebSocketController } = require('./controllers');
-    new WebSocketController(wss, config);
+    new WebSocketController(wss, webAccess, config);
 
     if (devModule) {
         devModule.logErrors(app);
@@ -174,64 +183,6 @@ async function main() {
     });
 }
 
-function initStatic(app, config) {
-    /*
-    publicFilesDir = `${config.dataDir}/public-files`;
-    filesPathStatic = `/book`;
-    filesDir = `${config.publicFilesDir}${config.filesPathStatic}`;
-    */
-    const filesPath = `${config.filesPathStatic}/`;
-    //загрузка или восстановление файлов в /files, при необходимости
-    app.use(async(req, res, next) => {
-        if ((req.method !== 'GET' && req.method !== 'HEAD') ||
-            !(req.path.indexOf(filesPath) === 0)
-            ) {
-            return next();
-        }
-
-        if (path.extname(req.path) == '.json')
-            return next();
-
-        const bookFile = `${config.publicFilesDir}${req.path}`;
-        const bookFileDesc = `${bookFile}.json`;
-
-        let downFileName = '';
-        //восстановим из json-файла описания
-        try {
-            if (await fs.pathExists(bookFile) && await fs.pathExists(bookFileDesc)) {
-                await utils.touchFile(bookFile);
-                await utils.touchFile(bookFileDesc);
-
-                let desc = await fs.readFile(bookFileDesc, 'utf8');
-                desc = JSON.parse(desc);
-                downFileName = desc.downFileName;
-            } else {
-                await fs.remove(bookFile);
-                await fs.remove(bookFileDesc);
-            }
-        } catch(e) {
-            log(LM_ERR, e.message);
-        }
-
-        if (downFileName)
-            res.downFileName = downFileName;
-
-        return next();
-    });
-
-    //заголовки при отдаче
-    app.use(config.filesPathStatic, express.static(config.filesDir, {
-        setHeaders: (res) => {
-            if (res.downFileName) {
-                res.set('Content-Encoding', 'gzip');
-                res.set('Content-Disposition', `inline; filename*=UTF-8''${encodeURIComponent(res.downFileName)}`);
-            }
-        },
-    }));
-
-    app.use(express.static(config.publicDir));
-}
-
 (async() => {
     try {
         await init();

server/static.js

@@ -0,0 +1,127 @@
+const fs = require('fs-extra');
+const path = require('path');
+const yazl = require('yazl');
+
+const express = require('express');
+const utils = require('./core/utils');
+const webAppDir = require('../build/appdir');
+
+const log = new (require('./core/AppLogger'))().log;//singleton
+
+function generateZip(zipFile, dataFile, dataFileInZip) {
+    return new Promise((resolve, reject) => {
+        const zip = new yazl.ZipFile();
+        zip.addFile(dataFile, dataFileInZip);
+        zip.outputStream
+            .pipe(fs.createWriteStream(zipFile)).on('error', reject)
+            .on('finish', (err) => {
+                if (err) reject(err);
+                else resolve();
+            }
+        );
+        zip.end();
+    });
+}
+
+module.exports = (app, config) => {
+    /*
+    config.bookPathStatic = `${config.rootPathStatic}/book`;
+    config.bookDir = `${config.publicFilesDir}/book`;
+    */
+    //загрузка или восстановление файлов в /public-files, при необходимости
+    app.use([`${config.bookPathStatic}/:fileName/:fileType`, `${config.bookPathStatic}/:fileName`], async(req, res, next) => {
+        if (req.method !== 'GET' && req.method !== 'HEAD') {
+            return next();
+        }
+
+        try {
+            const fileName = req.params.fileName;
+            const fileType = req.params.fileType;
+
+            if (path.extname(fileName) === '') {//восстановление файлов {hash}.raw, {hash}.zip
+                let bookFile = `${config.bookDir}/${fileName}`;
+                const bookFileDesc = `${bookFile}.d.json`;
+
+                //восстановим из json-файла описания
+                if (await fs.pathExists(bookFile) && await fs.pathExists(bookFileDesc)) {
+                    await utils.touchFile(bookFile);
+                    await utils.touchFile(bookFileDesc);
+
+                    let desc = await fs.readFile(bookFileDesc, 'utf8');
+                    let downFileName = (JSON.parse(desc)).downFileName;
+                    let gzipped = true;
+
+                    if (!req.acceptsEncodings('gzip') || fileType) {
+                        const rawFile = `${bookFile}.raw`;
+                        //не принимает gzip, тогда распакуем
+                        if (!await fs.pathExists(rawFile))
+                            await utils.gunzipFile(bookFile, rawFile);
+
+                        gzipped = false;
+
+                        if (fileType === undefined || fileType === 'raw') {
+                            bookFile = rawFile;
+                        } else if (fileType === 'zip') {
+                            //создаем zip-файл
+                            bookFile += '.zip';
+                            if (!await fs.pathExists(bookFile))
+                                await generateZip(bookFile, rawFile, downFileName);
+                            downFileName += '.zip';
+                        } else {
+                            throw new Error(`Unsupported file type: ${fileType}`);
+                        }
+                    }
+
+                    //отдача файла
+                    if (gzipped)
+                        res.set('Content-Encoding', 'gzip');
+                    res.set('Content-Disposition', `inline; filename*=UTF-8''${encodeURIComponent(downFileName)}`);
+                    res.sendFile(bookFile);
+                    return;
+                } else {
+                    await fs.remove(bookFile);
+                    await fs.remove(bookFileDesc);
+                }
+            }
+        } catch(e) {
+            log(LM_ERR, e.message);
+        }
+
+        return next();
+    });
+
+    //иначе просто отдаем запрошенный файл из /public-files
+    app.use(config.bookPathStatic, express.static(config.bookDir));
+
+    if (config.rootPathStatic) {
+        //подмена rootPath в файлах статики WebApp при необходимости
+        app.use(config.rootPathStatic, async(req, res, next) => {
+            if (req.method !== 'GET' && req.method !== 'HEAD') {
+                return next();
+            }
+
+            try {
+                const reqPath = (req.path == '/' ? '/index.html' : req.path);
+                const ext = path.extname(reqPath);
+                if (ext == '.html' || ext == '.js' || ext == '.css') {
+                    const reqFile = `${config.publicDir}${reqPath}`;
+                    const flagFile = `${reqFile}.replaced`;
+
+                    if (!await fs.pathExists(flagFile) && await fs.pathExists(reqFile)) {
+                        const content = await fs.readFile(reqFile, 'utf8');
+                        const re = new RegExp(`/${webAppDir}`, 'g');
+                        await fs.writeFile(reqFile, content.replace(re, `${config.rootPathStatic}/${webAppDir}`));
+                        await fs.writeFile(flagFile, '');
+                    }
+                }
+            } catch(e) {
+                log(LM_ERR, e.message);
+            }
+
+            return next();
+        });
+    }
+
+    //статика файлов WebApp
+    app.use(config.rootPathStatic, express.static(config.publicDir));
+};