Compare commits
100 Commits
0.11.8-2
...
dependabot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f9809e6661 | ||
|
|
083151460a | ||
|
|
c8f97ef386 | ||
|
|
c9a22a5eaf | ||
|
|
f926732070 | ||
|
|
3fbe6e9d9b | ||
|
|
225230381f | ||
|
|
b58d3a1b8b | ||
|
|
ffedce4351 | ||
|
|
a4fdb67913 | ||
|
|
6ba46421b9 | ||
|
|
d201961046 | ||
|
|
614a7f9da7 | ||
|
|
113ab3e596 | ||
|
|
c95870bfe5 | ||
|
|
e69e9335f9 | ||
|
|
fd21cd77dd | ||
|
|
d1880acaf9 | ||
|
|
428b507257 | ||
|
|
043dab0731 | ||
|
|
a7b4d9c0d8 | ||
|
|
6f9c95e351 | ||
|
|
7a53063ea8 | ||
|
|
ec4d5cac4f | ||
|
|
f8557cba88 | ||
|
|
5dead039f5 | ||
|
|
ea38392df4 | ||
|
|
0cc9d90a94 | ||
|
|
8c7b86c458 | ||
|
|
0e29546fc5 | ||
|
|
c9fa90d07c | ||
|
|
7d8e0525b1 | ||
|
|
ddf69876a6 | ||
|
|
1d78e75e38 | ||
|
|
7ed58fe3c6 | ||
|
|
058c79570b | ||
|
|
ec8fbcdf38 | ||
|
|
76673295bf | ||
|
|
084401b9c3 | ||
|
|
49038b10f7 | ||
|
|
45ea26810a | ||
|
|
18c8b2d803 | ||
|
|
f4a7482b3b | ||
|
|
32dff128f4 | ||
|
|
a00b2d6574 | ||
|
|
10c6e7d522 | ||
|
|
df6a256d51 | ||
|
|
fbdb74ee68 | ||
|
|
9ad7250da0 | ||
|
|
8c86984ea1 | ||
|
|
834b3f6210 | ||
|
|
105b8d5042 | ||
|
|
7ca8fd9ca1 | ||
|
|
0067c2800a | ||
|
|
688c8796f4 | ||
|
|
56af65742b | ||
|
|
629ad26d40 | ||
|
|
4b0e499c10 | ||
|
|
4697b46cba | ||
|
|
7f17e7daed | ||
|
|
a1fcb7597b | ||
|
|
35e46d0685 | ||
|
|
e2c0f3658b | ||
|
|
a3541ec16a | ||
|
|
08d0d3e7f3 | ||
|
|
2c47b2bee3 | ||
|
|
e6008b5ec4 | ||
|
|
e214ddf8d5 | ||
|
|
52927c6188 | ||
|
|
92ca9dd983 | ||
|
|
ed8be34c12 | ||
|
|
93bddfd05e | ||
|
|
8c99101bb3 | ||
|
|
d874f9ded4 | ||
|
|
d7be4d3d94 | ||
|
|
a2fa312839 | ||
|
|
f7e1e09928 | ||
|
|
f0832b07cb | ||
|
|
7c253df291 | ||
|
|
bb7cd9cbde | ||
|
|
56c4182985 | ||
|
|
cb6c7536bf | ||
|
|
fbfe8cbda0 | ||
|
|
6129d2d7eb | ||
|
|
16b30c922a | ||
|
|
c42ad66be6 | ||
|
|
f36c13fea1 | ||
|
|
4fd9d579e0 | ||
|
|
e65a8a13ea | ||
|
|
6ddb97d43e | ||
|
|
89082603de | ||
|
|
a9a3227433 | ||
|
|
60cb3514b2 | ||
|
|
4aeaa05f0b | ||
|
|
9c06552278 | ||
|
|
000f8dde82 | ||
|
|
9ffc218002 | ||
|
|
68a188f099 | ||
|
|
8829bb3810 | ||
|
|
5164d2f536 |
86
README.md
86
README.md
@@ -1,43 +1,43 @@
|
||||
# Liberama
|
||||
|
||||
Браузерная онлайн-читалка книг и децентрализованная библиотека.
|
||||
|
||||
Читалка <img src="https://omnireader.ru/favicon.ico" width="14px"/>[OmniReader](https://omnireader.ru) является частью данного проекта, размещенной на VPS:
|
||||
|
||||

|
||||

|
||||
|
||||
## VPS
|
||||
Для разворачивания читалки на чистом VPS с нуля смотрите [docs/omnireader.ru](docs/omnireader.ru/README.md)
|
||||
|
||||
## Сборка проекта
|
||||
Необходима версия node.js не ниже 14.
|
||||
|
||||
```
|
||||
$ git clone https://github.com/bookpauk/liberama
|
||||
$ cd liberama
|
||||
$ npm i
|
||||
```
|
||||
|
||||
### Windows
|
||||
```
|
||||
$ npm run build:win
|
||||
```
|
||||
|
||||
### Linux
|
||||
```
|
||||
$ npm run build:linux
|
||||
```
|
||||
|
||||
Результат сборки будет доступен в каталоге `dist/linux|win` в виде исполнимого (standalone) файла
|
||||
|
||||
### Разработка
|
||||
```
|
||||
$ npm run dev
|
||||
```
|
||||
|
||||
## Помочь проекту
|
||||
|
||||
* bitcoin: 3EbgZ7MK1UVaN38Gty5DCBtS4PknM4Ut85
|
||||
* litecoin: MP39Riec4oSNB3XMjiquKoLWxbufRYNXxZ
|
||||
* monero: 8BQPnvHcPSHM5gMQsmuypDgx9NNsYqwXKfDDuswEyF2Q2ewQSfd2pkK6ydH2wmMyq2JViZvy9DQ35hLMx7g72mFWNJTPtnz
|
||||
# Liberama
|
||||
|
||||
Браузерная онлайн-читалка книг и децентрализованная библиотека.
|
||||
|
||||
Читалка <img src="https://omnireader.ru/favicon.ico" width="14px"/>[OmniReader](https://omnireader.ru) является частью данного проекта, размещенной на VPS:
|
||||
|
||||

|
||||

|
||||
|
||||
## VPS
|
||||
Для разворачивания читалки на чистом VPS с нуля смотрите [docs/omnireader.ru](docs/omnireader.ru/README.md)
|
||||
|
||||
## Сборка проекта
|
||||
Необходима версия node.js не ниже 14.
|
||||
|
||||
```
|
||||
$ git clone https://github.com/bookpauk/liberama
|
||||
$ cd liberama
|
||||
$ npm i
|
||||
```
|
||||
|
||||
### Windows
|
||||
```
|
||||
$ npm run build:win
|
||||
```
|
||||
|
||||
### Linux
|
||||
```
|
||||
$ npm run build:linux
|
||||
```
|
||||
|
||||
Результат сборки будет доступен в каталоге `dist/linux|win` в виде исполнимого (standalone) файла
|
||||
|
||||
### Разработка
|
||||
```
|
||||
$ npm run dev
|
||||
```
|
||||
|
||||
## Помочь проекту
|
||||
|
||||
* bitcoin: bc1q3tyumaj648pp2e69jalsez2lnt462ttc33nup9
|
||||
* litecoin: MP39Riec4oSNB3XMjiquKoLWxbufRYNXxZ
|
||||
* monero: 8BQPnvHcPSHM5gMQsmuypDgx9NNsYqwXKfDDuswEyF2Q2ewQSfd2pkK6ydH2wmMyq2JViZvy9DQ35hLMx7g72mFWNJTPtnz
|
||||
|
||||
@@ -23,24 +23,6 @@ async function main() {
|
||||
|
||||
await fs.ensureDir(tempDownloadDir);
|
||||
|
||||
//sqlite3
|
||||
const sqliteRemoteUrl = 'https://mapbox-node-binary.s3.amazonaws.com/sqlite3/v5.0.2/napi-v3-linux-x64.tar.gz';
|
||||
const sqliteDecompressedFilename = `${tempDownloadDir}/napi-v3-linux-x64/node_sqlite3.node`;
|
||||
|
||||
if (!await fs.pathExists(sqliteDecompressedFilename)) {
|
||||
// Скачиваем node_sqlite3.node для винды, т.к. pkg не включает его в сборку
|
||||
const res = await axios.get(sqliteRemoteUrl, {responseType: 'stream'})
|
||||
await pipeline(res.data, fs.createWriteStream(`${tempDownloadDir}/sqlite.tar.gz`));
|
||||
console.log(`done downloading ${sqliteRemoteUrl}`);
|
||||
|
||||
//распаковываем
|
||||
console.log(await decomp.unpackTarZZ(`${tempDownloadDir}/sqlite.tar.gz`, tempDownloadDir));
|
||||
console.log('files decompressed');
|
||||
}
|
||||
// копируем в дистрибутив
|
||||
await fs.copy(sqliteDecompressedFilename, `${outDir}/node_sqlite3.node`);
|
||||
console.log(`copied ${sqliteDecompressedFilename} to ${outDir}/node_sqlite3.node`);
|
||||
|
||||
//ipfs
|
||||
const ipfsDecompressedFilename = `${tempDownloadDir}/go-ipfs/ipfs`;
|
||||
if (!await fs.pathExists(ipfsDecompressedFilename)) {
|
||||
|
||||
@@ -14,6 +14,7 @@ module.exports = {
|
||||
entry: [`${clientDir}/main.js`],
|
||||
output: {
|
||||
publicPath: '/app/',
|
||||
clean: true
|
||||
},
|
||||
|
||||
module: {
|
||||
|
||||
@@ -16,7 +16,8 @@ module.exports = merge(baseWpConfig, {
|
||||
devtool: 'inline-source-map',
|
||||
output: {
|
||||
path: `${publicDir}/app`,
|
||||
filename: 'bundle.js'
|
||||
filename: 'bundle.js',
|
||||
clean: true
|
||||
},
|
||||
|
||||
module: {
|
||||
@@ -38,6 +39,6 @@ module.exports = merge(baseWpConfig, {
|
||||
template: `${clientDir}/index.html.template`,
|
||||
filename: `${publicDir}/index.html`
|
||||
}),
|
||||
new CopyWebpackPlugin({patterns: [{from: `${clientDir}/assets/*`, to: `${publicDir}/`}]})
|
||||
new CopyWebpackPlugin({patterns: [{context: `${clientDir}/assets`, from: `${clientDir}/assets/*`, to: `${publicDir}/`}]})
|
||||
]
|
||||
});
|
||||
|
||||
@@ -18,7 +18,8 @@ module.exports = merge(baseWpConfig, {
|
||||
mode: 'production',
|
||||
output: {
|
||||
path: `${publicDir}/app_new`,
|
||||
filename: 'bundle.[contenthash].js'
|
||||
filename: 'bundle.[contenthash].js',
|
||||
clean: true
|
||||
},
|
||||
module: {
|
||||
rules: [
|
||||
@@ -54,7 +55,7 @@ module.exports = merge(baseWpConfig, {
|
||||
filename: `${publicDir}/index.html`
|
||||
}),
|
||||
new CopyWebpackPlugin({patterns:
|
||||
[{from: `${clientDir}/assets/*`, to: `${publicDir}/`, context: `${clientDir}/assets` }]
|
||||
[{context: `${clientDir}/assets`, from: `${clientDir}/assets/*`, to: `${publicDir}/` }]
|
||||
}),
|
||||
new GenerateSW({
|
||||
cacheId: 'liberama',
|
||||
|
||||
18
build/win.js
18
build/win.js
@@ -23,24 +23,6 @@ async function main() {
|
||||
|
||||
await fs.ensureDir(tempDownloadDir);
|
||||
|
||||
//sqlite3
|
||||
const sqliteRemoteUrl = 'https://mapbox-node-binary.s3.amazonaws.com/sqlite3/v5.0.2/napi-v3-win32-x64.tar.gz';
|
||||
const sqliteDecompressedFilename = `${tempDownloadDir}/napi-v3-win32-x64/node_sqlite3.node`;
|
||||
|
||||
if (!await fs.pathExists(sqliteDecompressedFilename)) {
|
||||
// Скачиваем node_sqlite3.node для винды, т.к. pkg не включает его в сборку
|
||||
const res = await axios.get(sqliteRemoteUrl, {responseType: 'stream'})
|
||||
await pipeline(res.data, fs.createWriteStream(`${tempDownloadDir}/sqlite.tar.gz`));
|
||||
console.log(`done downloading ${sqliteRemoteUrl}`);
|
||||
|
||||
//распаковываем
|
||||
console.log(await decomp.unpackTarZZ(`${tempDownloadDir}/sqlite.tar.gz`, tempDownloadDir));
|
||||
console.log('files decompressed');
|
||||
}
|
||||
// копируем в дистрибутив
|
||||
await fs.copy(sqliteDecompressedFilename, `${outDir}/node_sqlite3.node`);
|
||||
console.log(`copied ${sqliteDecompressedFilename} to ${outDir}/node_sqlite3.node`);
|
||||
|
||||
//ipfs
|
||||
const ipfsDecompressedFilename = `${tempDownloadDir}/go-ipfs/ipfs.exe`;
|
||||
if (!await fs.pathExists(ipfsDecompressedFilename)) {
|
||||
|
||||
@@ -9,7 +9,7 @@ class Misc {
|
||||
async loadConfig() {
|
||||
|
||||
const query = {params: [
|
||||
'name', 'version', 'mode', 'maxUploadFileSize', 'useExternalBookConverter', 'acceptFileExt', 'branch',
|
||||
'name', 'version', 'mode', 'maxUploadFileSize', 'useExternalBookConverter', 'acceptFileExt', 'bucEnabled', 'branch',
|
||||
]};
|
||||
|
||||
try {
|
||||
|
||||
@@ -229,6 +229,17 @@ class Reader {
|
||||
return (await axios.get(url)).data;
|
||||
}
|
||||
|
||||
async checkBuc(bookUrls) {
|
||||
const response = await wsc.message(await wsc.send({action: 'check-buc', bookUrls}));
|
||||
|
||||
if (response.error)
|
||||
throw new Error(response.error);
|
||||
|
||||
if (!response.data)
|
||||
throw new Error(`response.data is empty`);
|
||||
|
||||
return response.data;
|
||||
}
|
||||
}
|
||||
|
||||
export default new Reader();
|
||||
@@ -238,7 +238,7 @@ class App {
|
||||
const url = s[1] || '';
|
||||
const q = utils.parseQuery(s[0] || '');
|
||||
if (url) {
|
||||
q.url = decodeURIComponent(url);
|
||||
q.url = url;
|
||||
}
|
||||
|
||||
window.history.replaceState({}, '', '/');
|
||||
@@ -271,6 +271,10 @@ body, html, #app {
|
||||
font: normal 12pt ReaderDefault;
|
||||
}
|
||||
|
||||
.notify-margin {
|
||||
margin-top: 55px;
|
||||
}
|
||||
|
||||
.dborder {
|
||||
border: 2px solid magenta !important;
|
||||
}
|
||||
|
||||
@@ -1,70 +1,17 @@
|
||||
<template>
|
||||
<div class="page">
|
||||
<div class="box">
|
||||
<div class="column items-center" style="width: 500px">
|
||||
<p class="p">
|
||||
Вы можете пожертвовать на развитие проекта любую сумму:
|
||||
Здесь вы можете пожертвовать на развитие проекта:
|
||||
</p>
|
||||
<div class="address">
|
||||
<img class="logo" src="./assets/yoomoney.png">
|
||||
<q-btn class="q-ml-sm q-px-sm" dense no-caps @click="donateYooMoney">
|
||||
Пожертвовать
|
||||
</q-btn><br>
|
||||
<div class="para">
|
||||
{{ yooAddress }}
|
||||
<q-icon class="copy-icon" name="la la-copy" @click="copyAddress(yooAddress, 'Кошелёк ЮMoney')">
|
||||
<q-tooltip :delay="1000" anchor="top middle" self="center middle" content-style="font-size: 80%">
|
||||
Скопировать
|
||||
</q-tooltip>
|
||||
</q-icon>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!--div class="address">
|
||||
<img class="logo" src="./assets/paypal.png">
|
||||
<div class="para">
|
||||
{{ paypalAddress }}
|
||||
<q-icon class="copy-icon" name="la la-copy" @click="copyAddress(paypalAddress, 'Paypal-адрес')">
|
||||
<q-tooltip :delay="1000" anchor="top middle" self="center middle" content-style="font-size: 80%">
|
||||
Скопировать
|
||||
</q-tooltip>
|
||||
</q-icon>
|
||||
</div>
|
||||
</div-->
|
||||
<q-btn no-caps class="q-my-lg" color="green-8" size="14px" style="width: 200px" @click="makeDonation">
|
||||
<q-icon class="q-mr-xs" name="la la-donate" size="24px" />
|
||||
Поддержать проект
|
||||
</q-btn>
|
||||
|
||||
<div class="address">
|
||||
<img class="logo" src="./assets/bitcoin.png">
|
||||
<div class="para">
|
||||
{{ bitcoinAddress }}
|
||||
<q-icon class="copy-icon" name="la la-copy" @click="copyAddress(bitcoinAddress, 'Bitcoin-адрес')">
|
||||
<q-tooltip :delay="1000" anchor="top middle" self="center middle" content-style="font-size: 80%">
|
||||
Скопировать
|
||||
</q-tooltip>
|
||||
</q-icon>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="address">
|
||||
<img class="logo" src="./assets/litecoin.png">
|
||||
<div class="para">
|
||||
{{ litecoinAddress }}
|
||||
<q-icon class="copy-icon" name="la la-copy" @click="copyAddress(litecoinAddress, 'Litecoin-адрес')">
|
||||
<q-tooltip :delay="1000" anchor="top middle" self="center middle" content-style="font-size: 80%">
|
||||
Скопировать
|
||||
</q-tooltip>
|
||||
</q-icon>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="address">
|
||||
<img class="logo" src="./assets/monero.png">
|
||||
<div class="para">
|
||||
{{ moneroAddress }}
|
||||
<q-icon class="copy-icon" name="la la-copy" @click="copyAddress(moneroAddress, 'Monero-адрес')">
|
||||
<q-tooltip :delay="1000" anchor="top middle" self="center middle" content-style="font-size: 80%">
|
||||
Скопировать
|
||||
</q-tooltip>
|
||||
</q-icon>
|
||||
</div>
|
||||
<div style="font-size: 60%">
|
||||
* Ваш донат является подарком автору проекта
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -74,28 +21,14 @@
|
||||
//-----------------------------------------------------------------------------
|
||||
import vueComponent from '../../../vueComponent.js';
|
||||
|
||||
import {copyTextToClipboard} from '../../../../share/utils';
|
||||
import * as utils from '../../../../share/utils';
|
||||
|
||||
class DonateHelpPage {
|
||||
yooAddress = '410018702323056';
|
||||
paypalAddress = 'bookpauk@gmail.com';
|
||||
bitcoinAddress = '3EbgZ7MK1UVaN38Gty5DCBtS4PknM4Ut85';
|
||||
litecoinAddress = 'MP39Riec4oSNB3XMjiquKoLWxbufRYNXxZ';
|
||||
moneroAddress = '8BQPnvHcPSHM5gMQsmuypDgx9NNsYqwXKfDDuswEyF2Q2ewQSfd2pkK6ydH2wmMyq2JViZvy9DQ35hLMx7g72mFWNJTPtnz';
|
||||
|
||||
created() {
|
||||
}
|
||||
|
||||
donateYooMoney() {
|
||||
window.open(`https://yoomoney.ru/to/${this.yooAddress}`, '_blank');
|
||||
}
|
||||
|
||||
async copyAddress(address, prefix) {
|
||||
const result = await copyTextToClipboard(address);
|
||||
if (result)
|
||||
this.$root.notify.success(`${prefix} ${address} успешно скопирован в буфер обмена`);
|
||||
else
|
||||
this.$root.notify.error('Копирование не удалось');
|
||||
makeDonation() {
|
||||
utils.makeDonation();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -116,31 +49,4 @@ export default vueComponent(DonateHelpPage);
|
||||
padding: 0;
|
||||
text-indent: 20px;
|
||||
}
|
||||
|
||||
.box {
|
||||
max-width: 550px;
|
||||
overflow-wrap: break-word;
|
||||
}
|
||||
|
||||
.address {
|
||||
padding-top: 10px;
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
.para {
|
||||
margin: 10px 10px 10px 40px;
|
||||
}
|
||||
|
||||
.logo {
|
||||
width: 130px;
|
||||
position: relative;
|
||||
top: 10px;
|
||||
}
|
||||
|
||||
.copy-icon {
|
||||
margin-left: 10px;
|
||||
cursor: pointer;
|
||||
font-size: 120%;
|
||||
color: blue;
|
||||
}
|
||||
</style>
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.8 KiB |
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<Window @close="close">
|
||||
<Window @close="close" style="z-index: 200">
|
||||
<template #header>
|
||||
Справка
|
||||
</template>
|
||||
@@ -36,14 +36,14 @@ import CommonHelpPage from './CommonHelpPage/CommonHelpPage.vue';
|
||||
import HotkeysHelpPage from './HotkeysHelpPage/HotkeysHelpPage.vue';
|
||||
import MouseHelpPage from './MouseHelpPage/MouseHelpPage.vue';
|
||||
import VersionHistoryPage from './VersionHistoryPage/VersionHistoryPage.vue';
|
||||
//import DonateHelpPage from './DonateHelpPage/DonateHelpPage.vue';
|
||||
import DonateHelpPage from './DonateHelpPage/DonateHelpPage.vue';
|
||||
|
||||
const pages = {
|
||||
'CommonHelpPage': CommonHelpPage,
|
||||
'HotkeysHelpPage': HotkeysHelpPage,
|
||||
'MouseHelpPage': MouseHelpPage,
|
||||
'VersionHistoryPage': VersionHistoryPage,
|
||||
//'DonateHelpPage': DonateHelpPage,
|
||||
'DonateHelpPage': DonateHelpPage,
|
||||
};
|
||||
|
||||
const tabs = [
|
||||
@@ -51,7 +51,7 @@ const tabs = [
|
||||
['MouseHelpPage', 'Мышь/тачскрин'],
|
||||
['HotkeysHelpPage', 'Клавиатура'],
|
||||
['VersionHistoryPage', 'История версий'],
|
||||
//['DonateHelpPage', 'Помочь проекту'],
|
||||
['DonateHelpPage', 'Помочь проекту'],
|
||||
];
|
||||
|
||||
const componentOptions = {
|
||||
@@ -80,7 +80,7 @@ class HelpPage {
|
||||
}
|
||||
|
||||
activateDonateHelpPage() {
|
||||
//this.selectedTab = 'DonateHelpPage';
|
||||
this.selectedTab = 'DonateHelpPage';
|
||||
}
|
||||
|
||||
activateVersionHistoryHelpPage() {
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
<div class="col column justify-end items-center no-wrap overflow-hidden">
|
||||
<span v-if="mode == 'omnireader'" class="bottom-span clickable" @click="findBook">Найти книгу</span>
|
||||
<span class="bottom-span clickable" @click="openHelp">Справка</span>
|
||||
<!--span class="bottom-span clickable" @click="openDonate">Помочь проекту</span-->
|
||||
<span class="bottom-span clickable" @click="openDonate">Помочь проекту</span>
|
||||
|
||||
<span v-if="version == clientVersion" class="bottom-span">v{{ version }}</span>
|
||||
<span v-else class="bottom-span">Версия сервера {{ version }}, версия клиента {{ clientVersion }}, необходимо обновить страницу</span>
|
||||
|
||||
@@ -100,6 +100,12 @@
|
||||
</q-tooltip>
|
||||
</button>
|
||||
<button v-show="showToolButton['recentBooks']" ref="recentBooks" v-ripple class="tool-button" :class="buttonActiveClass('recentBooks')" @click="buttonClick('recentBooks')">
|
||||
<div v-show="bothBucEnabled && needBookUpdateCount > 0" style="position: absolute">
|
||||
<div class="need-book-update-count">
|
||||
{{ needBookUpdateCount }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<q-icon name="la la-book-open" size="32px" />
|
||||
<q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
|
||||
{{ rstore.readerActions['recentBooks'] }}
|
||||
@@ -156,7 +162,7 @@
|
||||
></SearchPage>
|
||||
<CopyTextPage v-if="copyTextActive" ref="copyTextPage" @do-action="doAction"></CopyTextPage>
|
||||
<LibsPage v-show="hidden" ref="libsPage" @load-book="loadBook" @libs-close="libsClose" @do-action="doAction"></LibsPage>
|
||||
<RecentBooksPage v-show="recentBooksActive" ref="recentBooksPage" @load-book="loadBook" @recent-books-close="recentBooksClose"></RecentBooksPage>
|
||||
<RecentBooksPage v-show="recentBooksActive" ref="recentBooksPage" @load-book="loadBook" @recent-books-close="recentBooksClose" @update-count-changed="updateCountChanged"></RecentBooksPage>
|
||||
<SettingsPage v-show="settingsActive" ref="settingsPage" @do-action="doAction"></SettingsPage>
|
||||
<HelpPage v-if="helpActive" ref="helpPage" @do-action="doAction"></HelpPage>
|
||||
<ClickMapPage v-show="clickMapActive" ref="clickMapPage"></ClickMapPage>
|
||||
@@ -286,7 +292,6 @@ class Reader {
|
||||
libsActive = false;
|
||||
recentBooksActive = false;
|
||||
clickControlActive = false;
|
||||
offlineModeActive = false;
|
||||
settingsActive = false;
|
||||
|
||||
clickMapActive = false;
|
||||
@@ -309,6 +314,10 @@ class Reader {
|
||||
donationVisible = false;
|
||||
dualPageMode = false;
|
||||
|
||||
bucEnabled = false;
|
||||
bucSetOnNew = false;
|
||||
needBookUpdateCount = 0;
|
||||
|
||||
created() {
|
||||
this.rstore = rstore;
|
||||
this.loading = true;
|
||||
@@ -357,6 +366,32 @@ class Reader {
|
||||
}
|
||||
}, 200);
|
||||
|
||||
this.debouncedRecentBooksPageUpdate = _.debounce(async() => {
|
||||
if (this.recentBooksActive) {
|
||||
await this.$refs.recentBooksPage.updateTableData();
|
||||
}
|
||||
}, 100);
|
||||
|
||||
this.recentItemKeys = [];
|
||||
this.debouncedSaveRecent = _.debounce(async() => {
|
||||
let timer = setTimeout(() => {
|
||||
if (!this.offlineModeActive)
|
||||
this.$root.notify.error('Таймаут соединения');
|
||||
}, 10000);
|
||||
|
||||
try {
|
||||
const itemKeys = this.recentItemKeys;
|
||||
this.recentItemKeys = [];
|
||||
//сохранение в удаленном хранилище
|
||||
await this.$refs.serverStorage.saveRecent(itemKeys);
|
||||
} catch (e) {
|
||||
if (!this.offlineModeActive)
|
||||
this.$root.notify.error(e.message);
|
||||
} finally {
|
||||
clearTimeout(timer);
|
||||
}
|
||||
}, 500, {maxWait: 1000});
|
||||
|
||||
document.addEventListener('fullscreenchange', () => {
|
||||
this.fullScreenActive = (document.fullscreenElement !== null);
|
||||
});
|
||||
@@ -394,16 +429,30 @@ class Reader {
|
||||
this.updateRoute();
|
||||
|
||||
await this.$refs.dialogs.init();
|
||||
|
||||
this.$refs.recentBooksPage.init();
|
||||
})();
|
||||
|
||||
//проверки обновлений читалки
|
||||
(async() => {
|
||||
this.isFirstNeedUpdateNotify = true;
|
||||
//вечный цикл, запрашиваем периодически конфиг для проверки выхода новой версии читалки
|
||||
while (true) {// eslint-disable-line no-constant-condition
|
||||
while (1) {// eslint-disable-line no-constant-condition
|
||||
await this.checkNewVersionAvailable();
|
||||
await utils.sleep(3600*1000); //каждый час
|
||||
await utils.sleep(60*60*1000); //каждый час
|
||||
}
|
||||
//дальше кода нет
|
||||
//дальше хода нет
|
||||
})();
|
||||
|
||||
//проверки обновлений книг
|
||||
(async() => {
|
||||
await utils.sleep(15*1000); //подождем неск. секунд перед первым запросом
|
||||
//вечный цикл, запрашиваем периодически обновления
|
||||
while (1) {// eslint-disable-line no-constant-condition
|
||||
await this.checkBuc();
|
||||
await utils.sleep(70*60*1000); //каждые 70 минут
|
||||
}
|
||||
//дальше хода нет
|
||||
})();
|
||||
}
|
||||
|
||||
@@ -425,6 +474,11 @@ class Reader {
|
||||
this.pdfQuality = settings.pdfQuality;
|
||||
this.dualPageMode = settings.dualPageMode;
|
||||
this.userWallpapers = settings.userWallpapers;
|
||||
this.bucEnabled = settings.bucEnabled;
|
||||
this.bucSizeDiff = settings.bucSizeDiff;
|
||||
this.bucSetOnNew = settings.bucSetOnNew;
|
||||
this.bucCancelEnabled = settings.bucCancelEnabled;
|
||||
this.bucCancelDays = settings.bucCancelDays;
|
||||
|
||||
this.readerActionByKeyCode = utils.userHotKeysObjectSwap(settings.userHotKeys);
|
||||
this.$root.readerActionByKeyEvent = (event) => {
|
||||
@@ -522,6 +576,92 @@ class Reader {
|
||||
}
|
||||
}
|
||||
|
||||
async checkBuc() {
|
||||
if (!this.bothBucEnabled)
|
||||
return;
|
||||
|
||||
try {
|
||||
const sorted = bookManager.getSortedRecent();
|
||||
|
||||
//выберем все кандидиаты на обновление
|
||||
const updateUrls = new Set();
|
||||
for (const book of sorted) {
|
||||
if (!book.deleted && book.checkBuc && book.url && book.url.indexOf('disk://') !== 0)
|
||||
updateUrls.add(book.url);
|
||||
}
|
||||
|
||||
//теперь по кусочкам запросим сервер
|
||||
const arr = Array.from(updateUrls);
|
||||
const bucSize = {};
|
||||
const chunkSize = 100;
|
||||
for (let i = 0; i < arr.length; i += chunkSize) {
|
||||
const chunk = arr.slice(i, i + chunkSize);
|
||||
|
||||
const data = await readerApi.checkBuc(chunk);
|
||||
|
||||
for (const item of data) {
|
||||
bucSize[item.id] = item.size;
|
||||
}
|
||||
|
||||
await utils.sleep(1000);//чтобы не ддосить сервер
|
||||
}
|
||||
|
||||
const checkSetTime = {};
|
||||
//проставим новые размеры у книг
|
||||
for (const book of sorted) {
|
||||
if (book.deleted)
|
||||
continue;
|
||||
|
||||
//размер 0 считаем отсутствующим
|
||||
if (book.url && bucSize[book.url] && bucSize[book.url] !== book.bucSize) {
|
||||
book.bucSize = bucSize[book.url];
|
||||
await bookManager.recentSetItem(book);
|
||||
}
|
||||
|
||||
//подготовка к следующему шагу, ищем книгу по url с максимальной датой установки checkBucTime/loadTime
|
||||
//от этой даты будем потом отсчитывать bucCancelDays
|
||||
if (updateUrls.has(book.url)) {
|
||||
let rec = checkSetTime[book.url] || {time: 0, loadTime: 0};
|
||||
|
||||
const time = (book.checkBucTime ? book.checkBucTime : (rec.loadTime || 0));
|
||||
if (time > rec.time || (time == rec.time && (book.loadTime > rec.loadTime)))
|
||||
rec = {time, loadTime: book.loadTime, key: book.key};
|
||||
|
||||
checkSetTime[book.url] = rec;
|
||||
}
|
||||
}
|
||||
|
||||
//bucCancelEnabled и bucCancelDays
|
||||
//снимем флаг checkBuc у необновлявшихся bucCancelDays
|
||||
if (this.bucCancelEnabled) {
|
||||
for (const rec of Object.values(checkSetTime)) {
|
||||
if (rec.time && Date.now() - rec.time > this.bucCancelDays*24*3600*1000) {
|
||||
const book = await bookManager.getRecentBook({key: rec.key});
|
||||
const needBookUpdate =
|
||||
book.checkBuc
|
||||
&& book.bucSize
|
||||
&& utils.hasProp(book, 'downloadSize')
|
||||
&& book.bucSize !== book.downloadSize
|
||||
&& (book.bucSize - book.downloadSize >= this.bucSizeDiff)
|
||||
;
|
||||
|
||||
if (book && !needBookUpdate) {
|
||||
await bookManager.setCheckBuc(book, undefined);//!!!
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
await this.$refs.recentBooksPage.updateTableData();
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
}
|
||||
}
|
||||
|
||||
updateCountChanged(event) {
|
||||
this.needBookUpdateCount = event.needBookUpdateCount;
|
||||
}
|
||||
|
||||
checkSetStorageAccessKey() {
|
||||
const q = this.$route.query;
|
||||
|
||||
@@ -580,7 +720,7 @@ class Reader {
|
||||
return;
|
||||
const recent = this.mostRecentBook();
|
||||
const pos = (recent && recent.bookPos && this.allowUrlParamBookPos ? `__p=${recent.bookPos}&` : '');
|
||||
const url = (recent ? `url=${recent.url}` : '');
|
||||
const url = (recent ? `url=${encodeURIComponent(recent.url)}` : '');
|
||||
if (isNewRoute)
|
||||
this.$router.push(`/reader?${pos}${url}`).catch(() => {});
|
||||
else
|
||||
@@ -600,6 +740,10 @@ class Reader {
|
||||
return versionHistory[0].version;
|
||||
}
|
||||
|
||||
get bothBucEnabled() {
|
||||
return this.$store.state.config.bucEnabled && this.bucEnabled;
|
||||
}
|
||||
|
||||
get routeParamUrl() {
|
||||
let result = '';
|
||||
const path = this.$route.fullPath;
|
||||
@@ -648,27 +792,12 @@ class Reader {
|
||||
}
|
||||
|
||||
if (eventName == 'recent-changed') {
|
||||
if (this.recentBooksActive) {
|
||||
await this.$refs.recentBooksPage.updateTableData();
|
||||
}
|
||||
this.debouncedRecentBooksPageUpdate();
|
||||
|
||||
//сохранение в serverStorage
|
||||
if (value) {
|
||||
await utils.sleep(500);
|
||||
|
||||
let timer = setTimeout(() => {
|
||||
if (!this.offlineModeActive)
|
||||
this.$root.notify.error('Таймаут соединения');
|
||||
}, 10000);
|
||||
|
||||
try {
|
||||
await this.$refs.serverStorage.saveRecent(value);
|
||||
} catch (e) {
|
||||
if (!this.offlineModeActive)
|
||||
this.$root.notify.error(e.message);
|
||||
} finally {
|
||||
clearTimeout(timer);
|
||||
}
|
||||
if (value && this.recentItemKeys.indexOf(value) < 0) {
|
||||
this.recentItemKeys.push(value);
|
||||
this.debouncedSaveRecent();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -677,6 +806,10 @@ class Reader {
|
||||
return this.reader.toolBarActive;
|
||||
}
|
||||
|
||||
get offlineModeActive() {
|
||||
return this.reader.offlineModeActive;
|
||||
}
|
||||
|
||||
mostRecentBook() {
|
||||
const result = bookManager.mostRecentBook();
|
||||
this.mostRecentBookReactive = result;
|
||||
@@ -889,7 +1022,7 @@ class Reader {
|
||||
}
|
||||
|
||||
offlineModeToggle() {
|
||||
this.offlineModeActive = !this.offlineModeActive;
|
||||
this.commit('reader/setOfflineModeActive', !this.offlineModeActive);
|
||||
this.$refs.serverStorage.offlineModeActive = this.offlineModeActive;
|
||||
}
|
||||
|
||||
@@ -1161,6 +1294,7 @@ class Reader {
|
||||
|
||||
this.checkBookPosPercent();
|
||||
this.activateClickMapPage();//no await
|
||||
this.$refs.recentBooksPage.updateTableData();//no await
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1237,9 +1371,13 @@ class Reader {
|
||||
delete wasOpened.loadTime;
|
||||
|
||||
// добавляем в историю
|
||||
await bookManager.setRecentBook(Object.assign(wasOpened, addedBook));
|
||||
const recentBook = await bookManager.setRecentBook(Object.assign(wasOpened, addedBook));
|
||||
if (this.bucSetOnNew) {
|
||||
await bookManager.setCheckBuc(recentBook, true);
|
||||
}
|
||||
|
||||
this.mostRecentBook();
|
||||
this.addAction(wasOpened.bookPos);
|
||||
this.addAction(recentBook.bookPos);
|
||||
this.updateRoute(true);
|
||||
|
||||
this.loaderActive = false;
|
||||
@@ -1251,6 +1389,7 @@ class Reader {
|
||||
|
||||
this.checkBookPosPercent();
|
||||
this.activateClickMapPage();//no await
|
||||
this.$refs.recentBooksPage.updateTableData();//no await
|
||||
} catch (e) {
|
||||
progress.hide(); this.progressActive = false;
|
||||
this.loaderActive = true;
|
||||
@@ -1601,4 +1740,16 @@ export default vueComponent(Reader);
|
||||
.clear {
|
||||
color: rgba(0,0,0,0);
|
||||
}
|
||||
|
||||
.need-book-update-count {
|
||||
position: relative;
|
||||
padding: 2px 6px 2px 6px;
|
||||
left: 27px;
|
||||
top: 22px;
|
||||
background-color: blue;
|
||||
border-radius: 10px;
|
||||
color: white;
|
||||
z-index: 10;
|
||||
font-size: 80%;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -18,56 +18,51 @@
|
||||
</template>
|
||||
</Dialog>
|
||||
|
||||
<Dialog ref="dialog2" v-model="donationVisible">
|
||||
<template #header>
|
||||
Здравствуйте, уважаемые читатели!
|
||||
</template>
|
||||
<q-dialog ref="dialog2" v-model="donationVisible" style="z-index: 100" no-route-dismiss no-esc-dismiss no-backdrop-dismiss>
|
||||
<div class="column bg-white no-wrap q-pa-md">
|
||||
<div class="row justify-center q-mb-md" style="font-size: 110%">
|
||||
Здравствуйте, дорогие читатели!
|
||||
</div>
|
||||
|
||||
<div style="word-break: normal">
|
||||
Стартовала ежегодная акция "Оплатим хостинг вместе".<br><br>
|
||||
<div class="q-mx-md column" style="word-break: normal">
|
||||
<div>
|
||||
Вот уже много лет мы все вместе пользуемся нашей любимой читалкой.<br><br>
|
||||
|
||||
Для оплаты годового хостинга читалки, необходимо собрать около 2000 рублей.
|
||||
В настоящий момент у автора эта сумма есть в наличии. Однако будет справедливо, если каждый
|
||||
сможет проголосовать рублем за то, чтобы читалка так и оставалась:
|
||||
Напоминаем вам, что проект является некоммерческим и обладает такими
|
||||
достоинствами, как:
|
||||
|
||||
<ul>
|
||||
<li>непрерывно улучшаемой</li>
|
||||
<li>без рекламы</li>
|
||||
<li>без регистрации</li>
|
||||
<li>Open Source</li>
|
||||
</ul>
|
||||
<ul>
|
||||
<li>все функции читалки открыты и доступны совершенно бесплатно</li>
|
||||
<li>в проекте отсутствует какая-либо реклама или баннеры</li>
|
||||
<li>нет никакой регистрации и монетизации</li>
|
||||
<li>нет сбора персональных данных</li>
|
||||
<li>открытый исходный код</li>
|
||||
<li>проект постепенно улучшается, по мере возможности</li>
|
||||
</ul>
|
||||
|
||||
Автор также обращается с просьбой о помощи в распространении
|
||||
<a href="https://omnireader.ru" target="_blank">ссылки</a>
|
||||
<q-icon class="copy-icon" name="la la-copy" @click="copyLink('https://omnireader.ru')">
|
||||
<q-tooltip :delay="1000" anchor="top middle" self="center middle" content-style="font-size: 80%">
|
||||
Скопировать
|
||||
</q-tooltip>
|
||||
</q-icon>
|
||||
на читалку через тематические форумы, соцсети, мессенджеры и пр.
|
||||
Чем нас больше, тем легче оставаться на плаву и тем больше мотивации у разработчика, чтобы продолжать работать над проектом.
|
||||
Однако на оплату хостинга читалки и сервера обновлений автор тратит свои
|
||||
собственные средства, а также тратит свое время и силы на улучшение проекта.
|
||||
<br><br>
|
||||
Поддержим же материально наш ресурс, чтобы и дальше спокойно существовать и развиваться:
|
||||
</div>
|
||||
|
||||
<br><br>
|
||||
Если соберется бóльшая сумма, то разработка децентрализованной библиотеки для свободного обмена книгами будет по возможности ускорена.
|
||||
<br><br>
|
||||
P.S. При необходимости можно воспользоваться подходящим обменником на <a href="https://www.bestchange.ru" target="_blank">bestchange.ru</a>
|
||||
<q-btn style="margin: 10px 50px 10px 50px" color="green-8" size="14px" no-caps @click="makeDonation">
|
||||
<q-icon class="q-mr-xs" name="la la-donate" size="24px" />
|
||||
Поддержать проект
|
||||
</q-btn>
|
||||
|
||||
<br><br>
|
||||
<div class="row justify-center">
|
||||
<!--q-btn class="q-px-sm" color="primary" dense no-caps @click="openDonate">
|
||||
Помочь проекту
|
||||
</q-btn-->
|
||||
<q-btn style="margin: 0 50px 20px 50px" size="14px" no-caps @click="donationDialogRemind">
|
||||
Напомнить в следующем месяце
|
||||
</q-btn>
|
||||
|
||||
<div class="row justify-center">
|
||||
<div class="q-px-sm clickable" style="font-size: 80%" @click="openDonate">
|
||||
Помочь проекту можно в любое время
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<template #footer>
|
||||
<span class="clickable row justify-end" style="font-size: 60%; color: grey" @click="donationDialogDisable">Больше не показывать</span>
|
||||
<br>
|
||||
<q-btn class="q-px-sm" dense no-caps @click="donationDialogRemind">
|
||||
Напомнить позже
|
||||
</q-btn>
|
||||
</template>
|
||||
</Dialog>
|
||||
</q-dialog>
|
||||
|
||||
<Dialog ref="dialog3" v-model="urlHelpVisible">
|
||||
<template #header>
|
||||
@@ -134,7 +129,7 @@ class ReaderDialogs {
|
||||
loadSettings() {
|
||||
const settings = this.settings;
|
||||
this.showWhatsNewDialog = settings.showWhatsNewDialog;
|
||||
this.showDonationDialog2020 = settings.showDonationDialog2020;
|
||||
this.showDonationDialog = settings.showDonationDialog;
|
||||
}
|
||||
|
||||
async showWhatsNew() {
|
||||
@@ -149,9 +144,9 @@ class ReaderDialogs {
|
||||
}
|
||||
|
||||
async showDonation() {
|
||||
const today = utils.formatDate(new Date(), 'coDate');
|
||||
const today = utils.formatDate(new Date(), 'coMonth');
|
||||
|
||||
if ((this.mode == 'omnireader' || this.mode == 'liberama.top') && today < '2020-03-01' && this.showDonationDialog2020 && this.donationRemindDate != today) {
|
||||
if ((this.mode == 'omnireader' || this.mode == 'liberama.top') && this.showDonationDialog && this.donationRemindDate != today) {
|
||||
await utils.sleep(3000);
|
||||
this.donationVisible = true;
|
||||
}
|
||||
@@ -166,20 +161,17 @@ class ReaderDialogs {
|
||||
this.urlHelpVisible = false;
|
||||
}
|
||||
|
||||
donationDialogDisable() {
|
||||
this.donationVisible = false;
|
||||
if (this.showDonationDialog2020) {
|
||||
this.commit('reader/setSettings', { showDonationDialog2020: false });
|
||||
}
|
||||
}
|
||||
|
||||
donationDialogRemind() {
|
||||
this.donationVisible = false;
|
||||
this.commit('reader/setDonationRemindDate', utils.formatDate(new Date(), 'coDate'));
|
||||
this.commit('reader/setDonationRemindDate', utils.formatDate(new Date(), 'coMonth'));
|
||||
}
|
||||
|
||||
makeDonation() {
|
||||
utils.makeDonation();
|
||||
this.donationDialogRemind();
|
||||
}
|
||||
|
||||
openDonate() {
|
||||
this.donationVisible = false;
|
||||
this.$emit('donate-toggle');
|
||||
}
|
||||
|
||||
|
||||
@@ -9,14 +9,26 @@
|
||||
|
||||
<template #buttons>
|
||||
<div
|
||||
v-show="needBookUpdateCount > 0"
|
||||
class="row justify-center items-center"
|
||||
:class="{'header-button': !archive, 'header-button-pressed': archive}"
|
||||
@mousedown.stop @click="archiveToggle"
|
||||
:class="{'header-button-update': !showNeedBookUpdateOnly, 'header-button-update-pressed': showNeedBookUpdateOnly}"
|
||||
@mousedown.stop @click="showNeedBookUpdateOnlyToggle"
|
||||
>
|
||||
<span style="font-size: 90%">{{ needBookUpdateCount }} обновлен{{ wordEnding(needBookUpdateCount, 3) }}</span>
|
||||
<q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
|
||||
{{ (needBookUpdateCount ? 'Скрыть обновления' : 'Показать обновления') }}
|
||||
</q-tooltip>
|
||||
</div>
|
||||
|
||||
<div
|
||||
class="row justify-center items-center"
|
||||
:class="{'header-button': !showArchive, 'header-button-pressed': showArchive}"
|
||||
@mousedown.stop @click="showArchiveToggle"
|
||||
>
|
||||
<q-icon class="q-mr-xs" name="la la-archive" size="20px" />
|
||||
<span style="font-size: 90%">Архив</span>
|
||||
<q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
|
||||
{{ (archive ? 'Скрыть архивные' : 'Показать архивные') }}
|
||||
{{ (showArchive ? 'Скрыть архивные' : 'Показать архивные') }}
|
||||
</q-tooltip>
|
||||
</div>
|
||||
</template>
|
||||
@@ -105,9 +117,17 @@
|
||||
</div>
|
||||
|
||||
<div class="row-part column justify-center items-stretch" style="width: 80px">
|
||||
<div class="col row justify-center items-center clickable" style="padding: 0 2px 0 2px" @click="loadBook(item)">
|
||||
<div class="col row justify-center items-center clickable" style="padding: 0 2px 0 2px" @click="loadBook(item, bothBucEnabled && item.needBookUpdate)">
|
||||
<div v-show="isLoadedCover(item.coverPageUrl)" style="height: 80px" v-html="getCoverHtml(item.coverPageUrl)" />
|
||||
<q-icon v-show="!isLoadedCover(item.coverPageUrl)" name="la la-book" size="40px" style="color: #dddddd" />
|
||||
|
||||
<div
|
||||
v-show="bothBucEnabled && item.needBookUpdate"
|
||||
class="column justify-center"
|
||||
style="position: absolute; background-color: rgba(255, 255, 255, 0.5); border-radius: 40px;"
|
||||
>
|
||||
<q-icon name="la la-sync" size="60px" style="color: blue" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-show="!showSameBook && item.group && item.group.length > 0" class="row justify-center" style="font-size: 70%">
|
||||
@@ -126,6 +146,10 @@
|
||||
<div style="font-size: 75%">
|
||||
{{ item.desc.title }}
|
||||
</div>
|
||||
<div v-show="bothBucEnabled && item.needBookUpdate" style="font-size: 75%; color: blue;">
|
||||
Размер: {{ item.bucSize - item.downloadSize > 0 ? '+' : '' }}{{ item.bucSize - item.downloadSize }}
|
||||
({{ item.downloadSize }} → {{ item.bucSize }})
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row" style="font-size: 10px">
|
||||
@@ -169,7 +193,7 @@
|
||||
class="col column justify-center"
|
||||
style="font-size: 75%; padding-left: 6px; border: 1px solid #cccccc; border-left: 0;"
|
||||
>
|
||||
<div :style="`margin-top: ${(archive ? 20 : 0)}px`">
|
||||
<div style="margin: 25px 0 0 5px">
|
||||
<a v-show="isUrl(item.url)" :href="item.url" target="_blank">Оригинал</a><br><br>
|
||||
<a :href="item.path" @click.prevent="downloadBook(item.path, item.fullTitle)">Скачать FB2</a>
|
||||
</div>
|
||||
@@ -181,12 +205,12 @@
|
||||
>
|
||||
<q-icon class="la la-times" size="12px" />
|
||||
<q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
|
||||
{{ (archive ? 'Удалить окончательно' : 'Перенести в архив') }}
|
||||
{{ (showArchive ? 'Удалить окончательно' : 'Перенести в архив') }}
|
||||
</q-tooltip>
|
||||
</div>
|
||||
|
||||
<div
|
||||
v-show="archive"
|
||||
v-show="showArchive"
|
||||
class="restore-button self-start row justify-center items-center clickable"
|
||||
@click="handleRestore(item.key)"
|
||||
>
|
||||
@@ -195,6 +219,27 @@
|
||||
Восстановить из архива
|
||||
</q-tooltip>
|
||||
</div>
|
||||
|
||||
<div
|
||||
v-show="bothBucEnabled && item.showCheckBuc"
|
||||
class="buc-checkbox self-start"
|
||||
>
|
||||
<q-checkbox
|
||||
v-model="item.checkBuc"
|
||||
size="xs"
|
||||
style="position: relative; top: -3px; left: -3px;"
|
||||
@update:model-value="checkBucChange(item)"
|
||||
>
|
||||
<q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">
|
||||
<div v-if="item.checkBuc === undefined">
|
||||
Проверка обновлений отключена автоматически<br>т.к. книга не обновлялась {{ bucCancelDays }} дней
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ (item.checkBuc ? 'Проверка обновлений книги включена' : 'Проверка обновлений книги отключена') }}
|
||||
</div>
|
||||
</q-tooltip>
|
||||
</q-checkbox>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</q-virtual-scroll>
|
||||
@@ -230,6 +275,12 @@ const componentOptions = {
|
||||
settings() {
|
||||
this.loadSettings();
|
||||
},
|
||||
needBookUpdateCount() {
|
||||
if (this.needBookUpdateCount == 0)
|
||||
this.showNeedBookUpdateOnly = false;
|
||||
|
||||
this.$emit('update-count-changed', {needBookUpdateCount: this.needBookUpdateCount});
|
||||
}
|
||||
},
|
||||
};
|
||||
class RecentBooksPage {
|
||||
@@ -240,7 +291,14 @@ class RecentBooksPage {
|
||||
tableData = [];
|
||||
sortMethod = '';
|
||||
showSameBook = false;
|
||||
archive = false;
|
||||
bucEnabled = false;
|
||||
bucSizeDiff = 0;
|
||||
bucSetOnNew = false;
|
||||
bucCancelDays = 0;
|
||||
needBookUpdateCount = 0;
|
||||
|
||||
showArchive = false;
|
||||
showNeedBookUpdateOnly = false;
|
||||
|
||||
covers = {};
|
||||
coversLoadFunc = {};
|
||||
@@ -277,12 +335,20 @@ class RecentBooksPage {
|
||||
const settings = this.settings;
|
||||
this.showSameBook = settings.recentShowSameBook;
|
||||
this.sortMethod = settings.recentSortMethod || 'loadTimeDesc';
|
||||
this.bucEnabled = settings.bucEnabled;
|
||||
this.bucSizeDiff = settings.bucSizeDiff;
|
||||
this.bucSetOnNew = settings.bucSetOnNew;
|
||||
this.bucCancelDays = settings.bucCancelDays;
|
||||
}
|
||||
|
||||
get settings() {
|
||||
return this.$store.state.reader.settings;
|
||||
}
|
||||
|
||||
get bothBucEnabled() {
|
||||
return this.$store.state.config.bucEnabled && this.bucEnabled;
|
||||
}
|
||||
|
||||
async updateTableData() {
|
||||
if (!this.inited)
|
||||
return;
|
||||
@@ -296,7 +362,7 @@ class RecentBooksPage {
|
||||
|
||||
//подготовка полей
|
||||
for (const book of sorted) {
|
||||
if ((!this.archive && book.deleted) || (this.archive && book.deleted != 1))
|
||||
if ((!this.showArchive && book.deleted) || (this.showArchive && book.deleted != 1))
|
||||
continue;
|
||||
|
||||
let d = new Date();
|
||||
@@ -320,7 +386,7 @@ class RecentBooksPage {
|
||||
|
||||
let title = bt.bookTitle;
|
||||
title = (title ? `"${title}"`: '');
|
||||
const author = (bt.author ? bt.author : (bt.bookTitle ? bt.bookTitle : (book.uploadFileName ? book.uploadFileName : book.url)));
|
||||
const author = (bt.author ? bt.author : (bt.bookTitle ? bt.bookTitle : (book.uploadFileName ? book.uploadFileName : book.url))) || '';
|
||||
|
||||
result.push({
|
||||
key: book.key,
|
||||
@@ -344,6 +410,19 @@ class RecentBooksPage {
|
||||
inGroup: false,
|
||||
coverPageUrl: book.coverPageUrl,
|
||||
|
||||
showCheckBuc: !this.showArchive && utils.hasProp(book, 'downloadSize') && book.url.indexOf('disk://') !== 0,
|
||||
checkBuc: book.checkBuc,
|
||||
needBookUpdate: (
|
||||
!this.showArchive
|
||||
&& book.checkBuc
|
||||
&& book.bucSize
|
||||
&& utils.hasProp(book, 'downloadSize')
|
||||
&& book.bucSize !== book.downloadSize
|
||||
&& (book.bucSize - book.downloadSize >= this.bucSizeDiff)
|
||||
),
|
||||
bucSize: book.bucSize,
|
||||
downloadSize: book.downloadSize,
|
||||
|
||||
//для сортировки
|
||||
loadTimeRaw,
|
||||
touchTimeRaw: book.touchTime,
|
||||
@@ -361,12 +440,15 @@ class RecentBooksPage {
|
||||
//фильтрация
|
||||
const search = this.search;
|
||||
if (search) {
|
||||
const lowerSearch = search.toLowerCase();
|
||||
|
||||
result = result.filter(item => {
|
||||
return !search ||
|
||||
item.touchTime.includes(search) ||
|
||||
item.loadTime.includes(search) ||
|
||||
item.desc.title.toLowerCase().includes(search.toLowerCase()) ||
|
||||
item.desc.author.toLowerCase().includes(search.toLowerCase())
|
||||
return !search
|
||||
|| item.touchTime.includes(search)
|
||||
|| item.loadTime.includes(search)
|
||||
|| item.desc.title.toLowerCase().includes(lowerSearch)
|
||||
|| item.desc.author.toLowerCase().includes(lowerSearch)
|
||||
;
|
||||
});
|
||||
}
|
||||
|
||||
@@ -399,6 +481,7 @@ class RecentBooksPage {
|
||||
}
|
||||
|
||||
//группировка
|
||||
let nbuCount = 0;
|
||||
const groups = {};
|
||||
const parents = {};
|
||||
let newResult = [];
|
||||
@@ -415,13 +498,20 @@ class RecentBooksPage {
|
||||
if (book.active)
|
||||
parents[book.sameBookKey].activeParent = true;
|
||||
|
||||
book.showCheckBuc = false;
|
||||
book.needBookUpdate = false;
|
||||
|
||||
groups[book.sameBookKey].push(book);
|
||||
}
|
||||
} else {
|
||||
newResult.push(book);
|
||||
}
|
||||
|
||||
if (book.needBookUpdate)
|
||||
nbuCount++;
|
||||
}
|
||||
result = newResult;
|
||||
this.needBookUpdateCount = nbuCount;
|
||||
|
||||
//showSameBook
|
||||
if (this.showSameBook) {
|
||||
@@ -438,6 +528,11 @@ class RecentBooksPage {
|
||||
result = newResult;
|
||||
}
|
||||
|
||||
//showNeedBookUpdateOnly
|
||||
if (this.showNeedBookUpdateOnly) {
|
||||
result = result.filter(item => item.needBookUpdate);
|
||||
}
|
||||
|
||||
//другие стадии
|
||||
//.....
|
||||
|
||||
@@ -456,7 +551,8 @@ class RecentBooksPage {
|
||||
const endings = [
|
||||
['ов', '', 'а', 'а', 'а', 'ов', 'ов', 'ов', 'ов', 'ов'],
|
||||
['й', 'я', 'и', 'и', 'и', 'й', 'й', 'й', 'й', 'й'],
|
||||
['о', '', 'о', 'о', 'о', 'о', 'о', 'о', 'о', 'о']
|
||||
['о', '', 'о', 'о', 'о', 'о', 'о', 'о', 'о', 'о'],
|
||||
['ий', 'ие', 'ия', 'ия', 'ия', 'ий', 'ий', 'ий', 'ий', 'ий']
|
||||
];
|
||||
const deci = num % 100;
|
||||
if (deci > 10 && deci < 20) {
|
||||
@@ -468,7 +564,7 @@ class RecentBooksPage {
|
||||
|
||||
get header() {
|
||||
const len = (this.tableData ? this.tableData.length : 0);
|
||||
return `${(this.search ? `Найден${this.wordEnding(len, 2)}` : 'Всего')} ${len} файл${this.wordEnding(len)}${this.archive ? ' в архиве' : ''}`;
|
||||
return `${(this.search || this.showNeedBookUpdateOnly ? `Найден${this.wordEnding(len, 2)}` : 'Всего')} ${len} файл${this.wordEnding(len)}${this.showArchive ? ' в архиве' : ''}`;
|
||||
}
|
||||
|
||||
async downloadBook(fb2path, fullTitle) {
|
||||
@@ -494,7 +590,7 @@ class RecentBooksPage {
|
||||
}
|
||||
|
||||
async handleDel(key) {
|
||||
if (!this.archive) {
|
||||
if (!this.showArchive) {
|
||||
await bookManager.delRecentBook({key});
|
||||
this.$root.notify.info('Перенесено в архив');
|
||||
} else {
|
||||
@@ -510,14 +606,11 @@ class RecentBooksPage {
|
||||
this.$root.notify.info('Восстановлено из архива');
|
||||
}
|
||||
|
||||
async loadBook(item) {
|
||||
//чтобы не обновлять лишний раз updateTableData
|
||||
this.inited = false;
|
||||
|
||||
async loadBook(item, force = false) {
|
||||
if (item.deleted)
|
||||
await this.handleRestore(item.key);
|
||||
|
||||
this.$emit('load-book', {url: item.url, path: item.path});
|
||||
this.$emit('load-book', {url: item.url, path: item.path, force});
|
||||
this.close();
|
||||
}
|
||||
|
||||
@@ -645,8 +738,10 @@ class RecentBooksPage {
|
||||
];
|
||||
}
|
||||
|
||||
archiveToggle() {
|
||||
this.archive = !this.archive;
|
||||
showArchiveToggle() {
|
||||
this.showArchive = !this.showArchive;
|
||||
this.showNeedBookUpdateOnly = false;
|
||||
|
||||
this.updateTableData();
|
||||
}
|
||||
|
||||
@@ -713,6 +808,27 @@ class RecentBooksPage {
|
||||
else
|
||||
return '';
|
||||
}
|
||||
|
||||
async checkBucChange(item) {
|
||||
const book = await bookManager.getRecentBook(item);
|
||||
if (book) {
|
||||
await bookManager.setCheckBuc(book, item.checkBuc);
|
||||
|
||||
this.$root.notify.info(item.checkBuc
|
||||
? 'Проверка обновлений книги включена'
|
||||
: 'Проверка обновлений книги отключена'
|
||||
);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
showNeedBookUpdateOnlyToggle() {
|
||||
this.showNeedBookUpdateOnly = !this.showNeedBookUpdateOnly;
|
||||
this.showArchive = false;
|
||||
|
||||
this.updateTableData();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
export default vueComponent(RecentBooksPage);
|
||||
@@ -842,17 +958,24 @@ export default vueComponent(RecentBooksPage);
|
||||
color: #555555;
|
||||
}
|
||||
|
||||
.header-button:hover {
|
||||
.header-button-update, .header-button-update-pressed {
|
||||
width: 120px;
|
||||
height: 30px;
|
||||
cursor: pointer;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.header-button:hover, .header-button-update:hover {
|
||||
color: white;
|
||||
background-color: #39902F;
|
||||
}
|
||||
|
||||
.header-button-pressed {
|
||||
.header-button-pressed, .header-button-update-pressed {
|
||||
color: black;
|
||||
background-color: yellow;
|
||||
}
|
||||
|
||||
.header-button-pressed:hover {
|
||||
color: black;
|
||||
.buc-checkbox {
|
||||
position: absolute;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -12,6 +12,7 @@ import bookManager from '../share/bookManager';
|
||||
import readerApi from '../../../api/reader';
|
||||
import * as utils from '../../../share/utils';
|
||||
import * as cryptoUtils from '../../../share/cryptoUtils';
|
||||
import LockQueue from '../../../share/LockQueue';
|
||||
|
||||
import localForage from 'localforage';
|
||||
const ssCacheStore = localForage.createInstance({
|
||||
@@ -48,6 +49,8 @@ class ServerStorage {
|
||||
this.keyInited = false;
|
||||
this.commit = this.$store.commit;
|
||||
this.prevServerStorageKey = null;
|
||||
this.lock = new LockQueue(100);
|
||||
|
||||
this.$root.generateNewServerStorageKey = () => {this.generateNewServerStorageKey()};
|
||||
|
||||
this.debouncedSaveSettings = _.debounce(() => {
|
||||
@@ -542,14 +545,16 @@ class ServerStorage {
|
||||
return true;
|
||||
}
|
||||
|
||||
async saveRecent(itemKey, recurse) {
|
||||
while (!this.inited || this.savingRecent)
|
||||
async saveRecent(itemKeys, recurse) {
|
||||
while (!this.inited)
|
||||
await utils.sleep(100);
|
||||
|
||||
if (!this.keyInited || !this.serverSyncEnabled || this.savingRecent)
|
||||
if (!this.keyInited || !this.serverSyncEnabled)
|
||||
return;
|
||||
|
||||
this.savingRecent = true;
|
||||
let needRecurseCall = false;
|
||||
|
||||
await this.lock.get();
|
||||
try {
|
||||
const bm = bookManager;
|
||||
|
||||
@@ -559,22 +564,29 @@ class ServerStorage {
|
||||
|
||||
//newRecentMod
|
||||
let newRecentMod = {};
|
||||
if (itemKey && this.cachedRecentPatch.data[itemKey] && this.prevItemKey == itemKey) {
|
||||
let oneItemKey = null;
|
||||
if (itemKeys && itemKeys.length == 1)
|
||||
oneItemKey = itemKeys[0];
|
||||
|
||||
if (oneItemKey && this.cachedRecentPatch.data[oneItemKey] && this.prevItemKey == oneItemKey) {
|
||||
newRecentMod = _.cloneDeep(this.cachedRecentMod);
|
||||
newRecentMod.rev++;
|
||||
|
||||
newRecentMod.data.key = itemKey;
|
||||
newRecentMod.data.mod = utils.getObjDiff(this.cachedRecentPatch.data[itemKey], bm.recent[itemKey]);
|
||||
newRecentMod.data.key = oneItemKey;
|
||||
newRecentMod.data.mod = utils.getObjDiff(this.cachedRecentPatch.data[oneItemKey], bm.recent[oneItemKey]);
|
||||
needSaveRecentMod = true;
|
||||
}
|
||||
this.prevItemKey = itemKey;
|
||||
this.prevItemKey = oneItemKey;
|
||||
|
||||
//newRecentPatch
|
||||
let newRecentPatch = {};
|
||||
if (itemKey && !needSaveRecentMod) {
|
||||
if (itemKeys && !needSaveRecentMod) {
|
||||
newRecentPatch = _.cloneDeep(this.cachedRecentPatch);
|
||||
newRecentPatch.rev++;
|
||||
newRecentPatch.data[itemKey] = _.cloneDeep(bm.recent[itemKey]);
|
||||
|
||||
for (const key of itemKeys) {
|
||||
newRecentPatch.data[key] = _.cloneDeep(bm.recent[key]);
|
||||
}
|
||||
|
||||
const applyMod = this.cachedRecentMod.data;
|
||||
if (applyMod && applyMod.key && newRecentPatch.data[applyMod.key])
|
||||
@@ -587,11 +599,7 @@ class ServerStorage {
|
||||
|
||||
//newRecent
|
||||
let newRecent = {};
|
||||
if (!itemKey || (needSaveRecentPatch && Object.keys(newRecentPatch.data).length > 10)) {
|
||||
//ждем весь bm.recent
|
||||
/*while (!bookManager.loaded)
|
||||
await utils.sleep(100);*/
|
||||
|
||||
if (!itemKeys || (needSaveRecentPatch && Object.keys(newRecentPatch.data).length > 10)) {
|
||||
newRecent = {rev: this.cachedRecent.rev + 1, data: _.cloneDeep(bm.recent)};
|
||||
newRecentPatch = {rev: this.cachedRecentPatch.rev + 1, data: {}};
|
||||
newRecentMod = {rev: this.cachedRecentMod.rev + 1, data: {}};
|
||||
@@ -625,10 +633,8 @@ class ServerStorage {
|
||||
|
||||
if (res)
|
||||
this.warning(`Последние изменения отменены. Данные синхронизированы с сервером.`);
|
||||
if (!recurse && itemKey) {
|
||||
this.savingRecent = false;
|
||||
await this.saveRecent(itemKey, true);
|
||||
return;
|
||||
if (!recurse && itemKeys) {
|
||||
needRecurseCall = true;
|
||||
}
|
||||
} else if (result.state == 'success') {
|
||||
if (needSaveRecent && newRecent.rev)
|
||||
@@ -639,8 +645,11 @@ class ServerStorage {
|
||||
await this.setCachedRecentMod(newRecentMod);
|
||||
}
|
||||
} finally {
|
||||
this.savingRecent = false;
|
||||
this.lock.ret();
|
||||
}
|
||||
|
||||
if (needRecurseCall)
|
||||
await this.saveRecent(itemKeys, true);
|
||||
}
|
||||
|
||||
async storageCheck(items) {
|
||||
|
||||
@@ -43,25 +43,14 @@
|
||||
|
||||
<div class="item row">
|
||||
<div class="label-6">Уведомление</div>
|
||||
<q-checkbox size="xs" v-model="showNeedUpdateNotify">
|
||||
Показывать уведомление о новой версии
|
||||
<q-checkbox size="xs" v-model="showDonationDialog">
|
||||
Показывать форму доната
|
||||
<q-tooltip :delay="1000" anchor="top middle" self="bottom middle" content-style="font-size: 80%">
|
||||
Напоминать о необходимости обновления страницы<br>
|
||||
при появлении новой версии читалки
|
||||
Показывать диалог для сбора пожертвований
|
||||
</q-tooltip>
|
||||
</q-checkbox>
|
||||
</div>
|
||||
|
||||
<!--div class="item row">
|
||||
<div class="label-6">Уведомление</div>
|
||||
<q-checkbox size="xs" v-model="showDonationDialog2020">
|
||||
Показывать "Оплатим хостинг вместе"
|
||||
<q-tooltip :delay="1000" anchor="top middle" self="bottom middle" content-style="font-size: 80%">
|
||||
Показывать уведомление "Оплатим хостинг вместе"
|
||||
</q-tooltip>
|
||||
</q-checkbox>
|
||||
</div-->
|
||||
|
||||
<!---------------------------------------------->
|
||||
<div class="part-header">Другое</div>
|
||||
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
<q-tab class="tab" name="keys" icon="la la-gamepad" label="Управление" />
|
||||
<q-tab class="tab" name="pagemove" icon="la la-school" label="Листание" />
|
||||
<q-tab class="tab" name="convert" icon="la la-magic" label="Конвертир." />
|
||||
<q-tab class="tab" name="update" icon="la la-sync" label="Обновление" />
|
||||
<q-tab class="tab" name="others" icon="la la-list-ul" label="Прочее" />
|
||||
<q-tab class="tab" name="reset" icon="la la-broom" label="Сброс" />
|
||||
<div v-show="tabsScrollable" class="q-pt-lg" />
|
||||
@@ -99,6 +100,10 @@
|
||||
<div v-if="selectedTab == 'convert'" class="fit tab-panel">
|
||||
@@include('./ConvertTab.inc');
|
||||
</div>
|
||||
<!-- Обновление ------------------------------------------------------------------>
|
||||
<div v-if="selectedTab == 'update'" class="fit tab-panel">
|
||||
@@include('./UpdateTab.inc');
|
||||
</div>
|
||||
<!-- Прочее ---------------------------------------------------------------------->
|
||||
<div v-if="selectedTab == 'others'" class="fit tab-panel">
|
||||
@@include('./OthersTab.inc');
|
||||
@@ -313,6 +318,10 @@ class SettingsPage {
|
||||
return this.$store.state.reader.profiles;
|
||||
}
|
||||
|
||||
get configBucEnabled() {
|
||||
return this.$store.state.config.bucEnabled;
|
||||
}
|
||||
|
||||
get currentProfileOptions() {
|
||||
const profNames = Object.keys(this.profiles)
|
||||
profNames.sort();
|
||||
|
||||
76
client/components/Reader/SettingsPage/UpdateTab.inc
Normal file
76
client/components/Reader/SettingsPage/UpdateTab.inc
Normal file
@@ -0,0 +1,76 @@
|
||||
<!---------------------------------------------->
|
||||
<div class="part-header">Обновление читалки</div>
|
||||
<div class="item row">
|
||||
<div class="label-6"></div>
|
||||
<q-checkbox size="xs" v-model="showNeedUpdateNotify">
|
||||
Проверять наличие новой версии
|
||||
<q-tooltip :delay="1000" anchor="top middle" self="bottom middle" content-style="font-size: 80%">
|
||||
Напоминать о необходимости обновления страницы<br>
|
||||
при появлении новой версии читалки
|
||||
</q-tooltip>
|
||||
</q-checkbox>
|
||||
</div>
|
||||
|
||||
<!---------------------------------------------->
|
||||
<div class="part-header">Обновление книг</div>
|
||||
<div v-show="!configBucEnabled" class="item row">
|
||||
<div class="label-6"></div>
|
||||
<div>Сервер обновлений временно не работает</div>
|
||||
</div>
|
||||
|
||||
<div v-show="configBucEnabled" class="item row">
|
||||
<div class="label-6"></div>
|
||||
<q-checkbox size="xs" v-model="bucEnabled">
|
||||
Проверять обновления книг
|
||||
</q-checkbox>
|
||||
</div>
|
||||
|
||||
<div v-show="configBucEnabled && bucEnabled" class="item row">
|
||||
<div class="label-6"></div>
|
||||
<div class="col-5 column justify-center items-end q-pr-xs">Разница размеров</div>
|
||||
<div class="col row">
|
||||
<NumInput class="col-left" v-model="bucSizeDiff" />
|
||||
|
||||
<q-tooltip :delay="1000" anchor="top middle" self="bottom middle" content-style="font-size: 80%">
|
||||
Уведомлять о наличии обновления книги в списке загруженных<br>
|
||||
при указанной разнице в размерах старого и нового файлов.<br>
|
||||
Разница указывается в байтах и может быть отрицательной.
|
||||
</q-tooltip>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-show="configBucEnabled && bucEnabled" class="item row">
|
||||
<div class="label-6"></div>
|
||||
<q-checkbox size="xs" v-model="bucSetOnNew">
|
||||
Автопроверка для вновь загружаемых
|
||||
<q-tooltip :delay="1000" anchor="top middle" self="bottom middle" content-style="font-size: 80%">
|
||||
Автоматически устанавливать флаг проверки<br>
|
||||
обновлений для всех вновь загружаемых книг
|
||||
</q-tooltip>
|
||||
</q-checkbox>
|
||||
</div>
|
||||
|
||||
<div v-show="configBucEnabled && bucEnabled" class="item row">
|
||||
<div class="label-6"></div>
|
||||
<q-checkbox size="xs" v-model="bucCancelEnabled">
|
||||
Отменять проверку через {{ bucCancelDays }} дней{{ (bucCancelEnabled ? ':' : '') }}
|
||||
<q-tooltip :delay="1000" anchor="top middle" self="bottom middle" content-style="font-size: 80%">
|
||||
Снимать флаг проверки с книги, если не было<br>
|
||||
обновлений в течение {{ bucCancelDays }} дней
|
||||
</q-tooltip>
|
||||
</q-checkbox>
|
||||
</div>
|
||||
|
||||
<div v-show="configBucEnabled && bucEnabled && bucCancelEnabled" class="item row">
|
||||
<div class="label-6"></div>
|
||||
<div class="col-5"></div>
|
||||
<div class="col row">
|
||||
<NumInput class="col-left" v-model="bucCancelDays" :min="1" :max="10000"/>
|
||||
|
||||
<q-tooltip :delay="1000" anchor="top middle" self="bottom middle" content-style="font-size: 80%">
|
||||
Снимать флаг проверки с книги, если не было<br>
|
||||
обновлений в течение {{ bucCancelDays }} дней
|
||||
</q-tooltip>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -234,6 +234,10 @@ class BookManager {
|
||||
|
||||
async addBook(newBook, callback) {
|
||||
let meta = {url: newBook.url, path: newBook.path};
|
||||
|
||||
if (newBook.downloadSize !== undefined && newBook.downloadSize >= 0)
|
||||
meta.downloadSize = newBook.downloadSize;
|
||||
|
||||
meta.key = this.keyFromPath(meta.path);
|
||||
meta.addTime = Date.now();//время добавления в кеш
|
||||
|
||||
@@ -483,6 +487,31 @@ class BookManager {
|
||||
await this.recentSetItem(item);
|
||||
}
|
||||
|
||||
async setCheckBuc(value, checkBuc) {
|
||||
const item = this.recent[value.key];
|
||||
|
||||
const updateItems = [];
|
||||
if (item) {
|
||||
if (item.sameBookKey !== undefined) {
|
||||
const sorted = this.getSortedRecent();
|
||||
for (const book of sorted) {
|
||||
if (!book.deleted && book.sameBookKey === item.sameBookKey)
|
||||
updateItems.push(book);
|
||||
}
|
||||
} else {
|
||||
updateItems.push(item);
|
||||
}
|
||||
}
|
||||
|
||||
const now = Date.now();
|
||||
for (const book of updateItems) {
|
||||
book.checkBuc = checkBuc;
|
||||
if (checkBuc)
|
||||
book.checkBucTime = now;
|
||||
await this.recentSetItem(book);
|
||||
}
|
||||
}
|
||||
|
||||
async cleanRecentBooks() {
|
||||
const sorted = this.getSortedRecent();
|
||||
|
||||
|
||||
@@ -1,4 +1,50 @@
|
||||
export const versionHistory = [
|
||||
{
|
||||
version: '0.12.2',
|
||||
releaseDate: '2022-09-04',
|
||||
showUntil: '2022-09-11',
|
||||
content:
|
||||
`
|
||||
<ul>
|
||||
<li>исправлен баг с формой для доната, показывалась каждый день, а не каждый месяц</li>
|
||||
<li>автор приносит извинения за доставленные неудобства</li>
|
||||
</ul>
|
||||
|
||||
`
|
||||
},
|
||||
|
||||
{
|
||||
version: '0.12.1',
|
||||
releaseDate: '2022-09-01',
|
||||
showUntil: '2022-08-30',
|
||||
content:
|
||||
`
|
||||
<ul>
|
||||
<li>добавлена форма для доната</li>
|
||||
<li>исправления багов</li>
|
||||
</ul>
|
||||
|
||||
`
|
||||
},
|
||||
|
||||
{
|
||||
version: '0.12.0',
|
||||
releaseDate: '2022-07-27',
|
||||
showUntil: '2022-08-03',
|
||||
content:
|
||||
`
|
||||
<ul>
|
||||
<li>запущен сервер проверки обновлений книг:</li>
|
||||
<ul>
|
||||
<li>проверка обновления той или иной книги настраивается в списке загруженных (чекбокс)</li>
|
||||
<li>для того, чтобы чекбокс появился у ранее загруженной, необходимо принудительно обновить книгу</li>
|
||||
<li>в настройках можно указать разницу размеров, при которой требуется делать уведомление</li>
|
||||
</ul>
|
||||
</ul>
|
||||
|
||||
`
|
||||
},
|
||||
|
||||
{
|
||||
version: '0.11.8',
|
||||
releaseDate: '2022-07-14',
|
||||
|
||||
@@ -27,9 +27,10 @@ class Notify {
|
||||
icon,
|
||||
actions: [{icon: 'la la-times notify-button-icon', color: 'black'}],
|
||||
html: true,
|
||||
classes: 'notify-margin',
|
||||
|
||||
message:
|
||||
`<div style="max-width: 350px;">
|
||||
`<div style="max-width: 350px">
|
||||
${caption}
|
||||
<div style="color: ${messageColor}; overflow-wrap: break-word; word-wrap: break-word;">${message}</div>
|
||||
</div>`
|
||||
|
||||
@@ -45,6 +45,8 @@ export function formatDate(d, format) {
|
||||
`${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()}`;
|
||||
}
|
||||
@@ -409,4 +411,8 @@ export function resizeImage(dataUrl, toWidth, toHeight, quality = 0.9) {
|
||||
if (!resolved)
|
||||
reject('Не удалось изменить размер');
|
||||
})().catch(reject); });
|
||||
}
|
||||
}
|
||||
|
||||
export function makeDonation() {
|
||||
window.open('https://donatty.com/liberama', '_blank');
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { createStore } from 'vuex';
|
||||
import createPersistedState from 'vuex-persistedstate';
|
||||
//import createPersistedState from 'vuex-persistedstate';
|
||||
import VuexPersistence from 'vuex-persist';
|
||||
|
||||
import root from './root.js';
|
||||
import uistate from './modules/uistate';
|
||||
@@ -8,6 +9,8 @@ import reader from './modules/reader';
|
||||
|
||||
const debug = process.env.NODE_ENV !== 'production';
|
||||
|
||||
const vuexLocal = new VuexPersistence();
|
||||
|
||||
export default createStore(Object.assign({}, root, {
|
||||
modules: {
|
||||
uistate,
|
||||
@@ -15,5 +18,5 @@ export default createStore(Object.assign({}, root, {
|
||||
reader,
|
||||
},
|
||||
strict: debug,
|
||||
plugins: [createPersistedState()]
|
||||
plugins: [vuexLocal.plugin]
|
||||
}));
|
||||
|
||||
@@ -180,19 +180,28 @@ const settingDefaults = {
|
||||
|
||||
showServerStorageMessages: true,
|
||||
showWhatsNewDialog: true,
|
||||
showDonationDialog2020: true,
|
||||
showDonationDialog: true,
|
||||
showNeedUpdateNotify: true,
|
||||
|
||||
fontShifts: {},
|
||||
showToolButton: {},
|
||||
toolBarHideOnScroll: true,
|
||||
toolBarHideOnScroll: false,
|
||||
userHotKeys: {},
|
||||
userWallpapers: [],
|
||||
|
||||
recentShowSameBook: false,
|
||||
recentSortMethod: '',
|
||||
|
||||
//Book Update Checker
|
||||
bucEnabled: true, // общее включение/выключение проверки обновлений
|
||||
bucSizeDiff: 1, // разница в размерах файла, при которой показывать наличие обновления
|
||||
bucSetOnNew: true, // автоматически включать проверку обновлений для вновь загружаемых файлов
|
||||
bucCancelEnabled: true, // вкл/выкл отмену проверки книг через bucCancelDays
|
||||
bucCancelDays: 90, // количество дней, через которое отменяется проверка книги, при условии отсутствия обновлений за это время
|
||||
|
||||
//для SettingsPage
|
||||
needUpdateSettingsView: 0,
|
||||
|
||||
};
|
||||
|
||||
for (const font of fonts)
|
||||
@@ -246,6 +255,7 @@ const libsDefaults = {
|
||||
// initial state
|
||||
const state = {
|
||||
toolBarActive: true,
|
||||
offlineModeActive: false,
|
||||
serverSyncEnabled: false,
|
||||
serverStorageKey: '',
|
||||
profiles: {},
|
||||
@@ -271,6 +281,9 @@ const mutations = {
|
||||
setToolBarActive(state, value) {
|
||||
state.toolBarActive = value;
|
||||
},
|
||||
setOfflineModeActive(state, value) {
|
||||
state.offlineModeActive = value;
|
||||
},
|
||||
setServerSyncEnabled(state, value) {
|
||||
state.serverSyncEnabled = value;
|
||||
},
|
||||
|
||||
@@ -6,6 +6,7 @@ server {
|
||||
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
|
||||
|
||||
server_name beta.liberama.top;
|
||||
set $liberama http://127.0.0.1:34082;
|
||||
|
||||
client_max_body_size 50m;
|
||||
proxy_read_timeout 1h;
|
||||
@@ -15,15 +16,20 @@ server {
|
||||
gzip_proxied expired no-cache no-store private auth;
|
||||
gzip_types *;
|
||||
|
||||
location @liberama {
|
||||
proxy_pass $liberama;
|
||||
}
|
||||
|
||||
location /api {
|
||||
proxy_pass http://127.0.0.1:34082;
|
||||
proxy_pass $liberama;
|
||||
}
|
||||
|
||||
location /ws {
|
||||
proxy_pass http://127.0.0.1:34082;
|
||||
proxy_pass $liberama;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
proxy_read_timeout 600s;
|
||||
}
|
||||
|
||||
location / {
|
||||
@@ -32,6 +38,11 @@ server {
|
||||
location /tmp {
|
||||
types { } default_type "application/xml; charset=utf-8";
|
||||
add_header Content-Encoding gzip;
|
||||
try_files $uri @liberama;
|
||||
}
|
||||
|
||||
location /upload {
|
||||
try_files $uri @liberama;
|
||||
}
|
||||
|
||||
location ~* \.(?:manifest|appcache|html)$ {
|
||||
@@ -50,6 +61,7 @@ server {
|
||||
server {
|
||||
listen 80;
|
||||
server_name b.beta.liberama.top;
|
||||
set $liberama http://127.0.0.1:34082;
|
||||
|
||||
client_max_body_size 50m;
|
||||
proxy_read_timeout 1h;
|
||||
@@ -59,15 +71,20 @@ server {
|
||||
gzip_proxied expired no-cache no-store private auth;
|
||||
gzip_types *;
|
||||
|
||||
location @liberama {
|
||||
proxy_pass $liberama;
|
||||
}
|
||||
|
||||
location /api {
|
||||
proxy_pass http://127.0.0.1:34082;
|
||||
proxy_pass $liberama;
|
||||
}
|
||||
|
||||
location /ws {
|
||||
proxy_pass http://127.0.0.1:34082;
|
||||
proxy_pass $liberama;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
proxy_read_timeout 600s;
|
||||
}
|
||||
|
||||
location / {
|
||||
@@ -76,6 +93,11 @@ server {
|
||||
location /tmp {
|
||||
types { } default_type "application/xml; charset=utf-8";
|
||||
add_header Content-Encoding gzip;
|
||||
try_files $uri @liberama;
|
||||
}
|
||||
|
||||
location /upload {
|
||||
try_files $uri @liberama;
|
||||
}
|
||||
|
||||
location ~* \.(?:manifest|appcache|html)$ {
|
||||
|
||||
@@ -6,6 +6,7 @@ server {
|
||||
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
|
||||
|
||||
server_name beta.omnireader.ru;
|
||||
set $liberama http://127.0.0.1:34081;
|
||||
|
||||
client_max_body_size 50m;
|
||||
proxy_read_timeout 1h;
|
||||
@@ -15,15 +16,20 @@ server {
|
||||
gzip_proxied expired no-cache no-store private auth;
|
||||
gzip_types *;
|
||||
|
||||
location @liberama {
|
||||
proxy_pass $liberama;
|
||||
}
|
||||
|
||||
location /api {
|
||||
proxy_pass http://127.0.0.1:34081;
|
||||
proxy_pass $liberama;
|
||||
}
|
||||
|
||||
location /ws {
|
||||
proxy_pass http://127.0.0.1:34081;
|
||||
proxy_pass $liberama;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
proxy_read_timeout 600s;
|
||||
}
|
||||
|
||||
location / {
|
||||
@@ -32,6 +38,11 @@ server {
|
||||
location /tmp {
|
||||
types { } default_type "application/xml; charset=utf-8";
|
||||
add_header Content-Encoding gzip;
|
||||
try_files $uri @liberama;
|
||||
}
|
||||
|
||||
location /upload {
|
||||
try_files $uri @liberama;
|
||||
}
|
||||
|
||||
location ~* \.(?:manifest|appcache|html)$ {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
server {
|
||||
listen 80;
|
||||
server_name beta.omnireader.ru;
|
||||
set $liberama http://127.0.0.1:34081;
|
||||
|
||||
client_max_body_size 50m;
|
||||
proxy_read_timeout 1h;
|
||||
@@ -10,15 +11,20 @@ server {
|
||||
gzip_proxied expired no-cache no-store private auth;
|
||||
gzip_types *;
|
||||
|
||||
location @liberama {
|
||||
proxy_pass $liberama;
|
||||
}
|
||||
|
||||
location /api {
|
||||
proxy_pass http://127.0.0.1:34081;
|
||||
proxy_pass $liberama;
|
||||
}
|
||||
|
||||
location /ws {
|
||||
proxy_pass http://127.0.0.1:34081;
|
||||
proxy_pass $liberama;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
proxy_read_timeout 600s;
|
||||
}
|
||||
|
||||
location / {
|
||||
@@ -27,6 +33,11 @@ server {
|
||||
location /tmp {
|
||||
types { } default_type "application/xml; charset=utf-8";
|
||||
add_header Content-Encoding gzip;
|
||||
try_files $uri @liberama;
|
||||
}
|
||||
|
||||
location /upload {
|
||||
try_files $uri @liberama;
|
||||
}
|
||||
|
||||
location ~* \.(?:manifest|appcache|html)$ {
|
||||
|
||||
@@ -10,7 +10,7 @@ git clone https://github.com/bookpauk/liberama
|
||||
### node.js
|
||||
```
|
||||
sudo apt install -y curl
|
||||
curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash -
|
||||
curl -sL https://deb.nodesource.com/setup_16.x | sudo -E bash -
|
||||
sudo apt install -y nodejs
|
||||
```
|
||||
|
||||
|
||||
5395
package-lock.json
generated
5395
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
67
package.json
67
package.json
@@ -1,17 +1,17 @@
|
||||
{
|
||||
"name": "Liberama",
|
||||
"version": "0.11.8",
|
||||
"version": "0.12.2",
|
||||
"author": "Book Pauk <bookpauk@gmail.com>",
|
||||
"license": "CC0-1.0",
|
||||
"repository": "bookpauk/liberama",
|
||||
"engines": {
|
||||
"node": ">=14.4.0"
|
||||
"node": ">=16.16.0"
|
||||
},
|
||||
"scripts": {
|
||||
"dev": "nodemon --inspect --ignore server/public --ignore server/data --ignore client --exec 'node server'",
|
||||
"build:client": "webpack --config build/webpack.prod.config.js",
|
||||
"build:linux": "npm run build:client && node build/linux && pkg -t node14-linux-x64 -C GZip -o dist/linux/liberama .",
|
||||
"build:win": "npm run build:client && node build/win && pkg -t node14-win-x64 -C GZip -o dist/win/liberama .",
|
||||
"build:linux": "npm run build:client && node build/linux && pkg -t node16-linux-x64 -C GZip -o dist/linux/liberama .",
|
||||
"build:win": "npm run build:client && node build/win && pkg -t node16-win-x64 -C GZip -o dist/win/liberama .",
|
||||
"lint": "eslint --ext=.js,.vue client server",
|
||||
"build:client-dev": "webpack --config build/webpack.dev.config.js",
|
||||
"postinstall": "npm run build:client-dev && node build/linux"
|
||||
@@ -21,67 +21,64 @@
|
||||
"scripts": "server/config/*.js"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.16.0",
|
||||
"@babel/eslint-parser": "^7.16.3",
|
||||
"@babel/eslint-plugin": "^7.14.5",
|
||||
"@babel/plugin-proposal-decorators": "^7.16.0",
|
||||
"@babel/preset-env": "^7.16.0",
|
||||
"@babel/core": "^7.18.13",
|
||||
"@babel/eslint-parser": "^7.18.9",
|
||||
"@babel/eslint-plugin": "^7.18.10",
|
||||
"@babel/plugin-proposal-decorators": "^7.18.10",
|
||||
"@babel/preset-env": "^7.18.10",
|
||||
"@vue/compiler-sfc": "^3.2.22",
|
||||
"babel-loader": "^8.2.3",
|
||||
"babel-loader": "^8.2.5",
|
||||
"copy-webpack-plugin": "^11.0.0",
|
||||
"css-loader": "^6.5.1",
|
||||
"css-loader": "^6.7.1",
|
||||
"css-minimizer-webpack-plugin": "^4.0.0",
|
||||
"eslint": "^8.19.0",
|
||||
"eslint-plugin-vue": "^9.2.0",
|
||||
"eslint": "^8.23.0",
|
||||
"eslint-plugin-vue": "^9.4.0",
|
||||
"html-webpack-plugin": "^5.5.0",
|
||||
"mini-css-extract-plugin": "^2.4.4",
|
||||
"pkg": "^5.5.1",
|
||||
"terser-webpack-plugin": "^5.2.5",
|
||||
"mini-css-extract-plugin": "^2.6.1",
|
||||
"pkg": "^5.8.0",
|
||||
"terser-webpack-plugin": "^5.3.6",
|
||||
"vue-eslint-parser": "^9.0.3",
|
||||
"vue-loader": "^17.0.0",
|
||||
"vue-style-loader": "^4.1.3",
|
||||
"webpack": "^5.64.1",
|
||||
"webpack-cli": "^4.9.1",
|
||||
"webpack-dev-middleware": "^5.2.1",
|
||||
"webpack-hot-middleware": "^2.25.1",
|
||||
"webpack": "^5.74.0",
|
||||
"webpack-cli": "^4.10.0",
|
||||
"webpack-dev-middleware": "^5.3.3",
|
||||
"webpack-hot-middleware": "^2.25.2",
|
||||
"webpack-merge": "^5.8.0",
|
||||
"workbox-webpack-plugin": "^6.4.1"
|
||||
"workbox-webpack-plugin": "^6.5.4"
|
||||
},
|
||||
"dependencies": {
|
||||
"@quasar/extras": "^1.12.0",
|
||||
"@vue/compat": "^3.2.21",
|
||||
"@quasar/extras": "^1.15.2",
|
||||
"@vue/compat": "^3.2.38",
|
||||
"axios": "^0.27.2",
|
||||
"base-x": "^4.0.0",
|
||||
"chardet": "^1.4.0",
|
||||
"compression": "^1.7.4",
|
||||
"express": "^4.17.1",
|
||||
"express": "^4.18.1",
|
||||
"fg-loadcss": "^3.1.0",
|
||||
"fs-extra": "^10.1.0",
|
||||
"he": "^1.2.0",
|
||||
"iconv-lite": "^0.6.3",
|
||||
"jembadb": "^3.0.8",
|
||||
"jembadb": "^4.2.0",
|
||||
"localforage": "^1.10.0",
|
||||
"lodash": "^4.17.21",
|
||||
"minimist": "^1.2.5",
|
||||
"minimist": "^1.2.6",
|
||||
"multer": "^1.4.5-lts.1",
|
||||
"pako": "^2.0.4",
|
||||
"path-browserify": "^1.0.1",
|
||||
"pidusage": "^3.0.0",
|
||||
"quasar": "^2.7.5",
|
||||
"quasar": "^2.7.7",
|
||||
"safe-buffer": "^5.2.1",
|
||||
"sanitize-html": "^2.5.3",
|
||||
"sanitize-html": "^2.7.1",
|
||||
"sjcl": "^1.0.8",
|
||||
"sql-template-strings": "^2.2.2",
|
||||
"sqlite": "^4.0.23",
|
||||
"sqlite3": "^5.0.2",
|
||||
"tar-fs": "^2.1.1",
|
||||
"unbzip2-stream": "^1.4.3",
|
||||
"vue": "^3.2.37",
|
||||
"vue-router": "^4.1.1",
|
||||
"vue-router": "^4.1.5",
|
||||
"vuex": "^4.0.2",
|
||||
"vuex-persistedstate": "^4.1.0",
|
||||
"webdav": "^4.7.0",
|
||||
"ws": "^8.2.3",
|
||||
"vuex-persist": "^3.1.3",
|
||||
"webdav": "^4.11.0",
|
||||
"ws": "^8.8.1",
|
||||
"zip-stream": "^4.1.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,27 +23,27 @@ module.exports = {
|
||||
|
||||
useExternalBookConverter: false,
|
||||
acceptFileExt: '.fb2, .fb3, .html, .txt, .zip, .bz2, .gz, .rar, .epub, .mobi, .rtf, .doc, .docx, .pdf, .djvu, .jpg, .jpeg, .png',
|
||||
webConfigParams: ['name', 'version', 'mode', 'maxUploadFileSize', 'useExternalBookConverter', 'acceptFileExt', 'branch'],
|
||||
|
||||
db: [
|
||||
{
|
||||
poolName: 'app',
|
||||
connCount: 20,
|
||||
fileName: 'app.sqlite',
|
||||
},
|
||||
{
|
||||
poolName: 'readerStorage',
|
||||
connCount: 20,
|
||||
fileName: 'reader-storage.sqlite',
|
||||
}
|
||||
],
|
||||
webConfigParams: ['name', 'version', 'mode', 'maxUploadFileSize', 'useExternalBookConverter', 'acceptFileExt', 'bucEnabled', 'branch'],
|
||||
|
||||
jembaDb: [
|
||||
{
|
||||
serverMode: ['reader', 'omnireader', 'liberama.top'],
|
||||
dbName: 'app',
|
||||
thread: true,
|
||||
openAll: true,
|
||||
},
|
||||
{
|
||||
serverMode: ['reader', 'omnireader', 'liberama.top'],
|
||||
dbName: 'reader-storage',
|
||||
thread: true,
|
||||
openAll: true,
|
||||
}
|
||||
},
|
||||
{
|
||||
serverMode: 'book_update_checker',
|
||||
dbName: 'book-update-server',
|
||||
thread: true,
|
||||
openAll: true,
|
||||
},
|
||||
],
|
||||
|
||||
servers: [
|
||||
@@ -53,16 +53,31 @@ module.exports = {
|
||||
ip: '0.0.0.0',
|
||||
port: '33080',
|
||||
},
|
||||
/*{
|
||||
serverName: '2',
|
||||
mode: 'book_update_checker', //'none', 'normal', 'site', 'reader', 'omnireader', 'liberama.top', 'book_update_checker'
|
||||
isHttps: true,
|
||||
keysFile: 'server',
|
||||
ip: '0.0.0.0',
|
||||
port: '33443',
|
||||
accessToken: '',
|
||||
}*/
|
||||
],
|
||||
|
||||
remoteWebDavStorage: false,
|
||||
remoteStorage: false,
|
||||
/*
|
||||
remoteWebDavStorage: {
|
||||
url: '127.0.0.1:1900',
|
||||
username: '',
|
||||
password: '',
|
||||
remoteStorage: {
|
||||
url: 'wss://127.0.0.1:11900',
|
||||
accessToken: '',
|
||||
},
|
||||
*/
|
||||
|
||||
bucEnabled: false,
|
||||
bucServer: false,
|
||||
/*
|
||||
bucServer: {
|
||||
url: 'wss://127.0.0.1:33443',
|
||||
accessToken: '',
|
||||
}
|
||||
*/
|
||||
};
|
||||
|
||||
|
||||
@@ -10,7 +10,9 @@ const propsToSave = [
|
||||
'useExternalBookConverter',
|
||||
|
||||
'servers',
|
||||
'remoteWebDavStorage',
|
||||
'remoteStorage',
|
||||
'bucEnabled',
|
||||
'bucServer',
|
||||
];
|
||||
|
||||
let instance = null;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
const WebSocket = require ('ws');
|
||||
const WebSocket = require('ws');
|
||||
//const _ = require('lodash');
|
||||
|
||||
const BUCServer = require('../core/BookUpdateChecker/BUCServer');
|
||||
const log = new (require('../core/AppLogger'))().log;//singleton
|
||||
//const utils = require('../core/utils');
|
||||
|
||||
@@ -12,7 +13,8 @@ class BookUpdateCheckerController {
|
||||
this.config = config;
|
||||
this.isDevelopment = (config.branch == 'development');
|
||||
|
||||
//this.readerStorage = new JembaReaderStorage();
|
||||
this.accessToken = config.accessToken;
|
||||
this.bucServer = new BUCServer(config);
|
||||
|
||||
this.wss = wss;
|
||||
|
||||
@@ -46,7 +48,7 @@ class BookUpdateCheckerController {
|
||||
let req = {};
|
||||
try {
|
||||
if (this.isDevelopment) {
|
||||
log(`WebSocket-IN: ${message.substr(0, 4000)}`);
|
||||
log(`BUC-WebSocket-IN: ${message.substr(0, 4000)}`);
|
||||
}
|
||||
|
||||
req = JSON.parse(message);
|
||||
@@ -56,9 +58,16 @@ class BookUpdateCheckerController {
|
||||
//pong for WebSocketConnection
|
||||
this.send({_rok: 1}, req, ws);
|
||||
|
||||
if (req.accessToken !== this.accessToken)
|
||||
throw new Error('Access denied');
|
||||
|
||||
switch (req.action) {
|
||||
case 'test':
|
||||
await this.test(req, ws); break;
|
||||
case 'get-buc':
|
||||
await this.getBuc(req, ws); break;
|
||||
case 'update-buc':
|
||||
await this.updateBuc(req, ws); break;
|
||||
|
||||
default:
|
||||
throw new Error(`Action not found: ${req.action}`);
|
||||
@@ -79,7 +88,7 @@ class BookUpdateCheckerController {
|
||||
ws.send(message);
|
||||
|
||||
if (this.isDevelopment) {
|
||||
log(`WebSocket-OUT: ${message.substr(0, 4000)}`);
|
||||
log(`BUC-WebSocket-OUT: ${message.substr(0, 4000)}`);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -90,6 +99,28 @@ class BookUpdateCheckerController {
|
||||
this.send({message: 'Liberama project is awesome'}, req, ws);
|
||||
}
|
||||
|
||||
async getBuc(req, ws) {
|
||||
if (!req.fromCheckTime)
|
||||
throw new Error(`key 'fromCheckTime' is empty`);
|
||||
|
||||
await this.bucServer.getBuc(req.fromCheckTime, (rows) => {
|
||||
this.send({state: 'get', rows}, req, ws);
|
||||
});
|
||||
|
||||
this.send({state: 'finish'}, req, ws);
|
||||
}
|
||||
|
||||
async updateBuc(req, ws) {
|
||||
if (!req.bookUrls)
|
||||
throw new Error(`key 'bookUrls' is empty`);
|
||||
|
||||
if (!Array.isArray(req.bookUrls))
|
||||
throw new Error(`key 'bookUrls' must be array`);
|
||||
|
||||
await this.bucServer.updateBuc(req.bookUrls);
|
||||
|
||||
this.send({state: 'success'}, req, ws);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = BookUpdateCheckerController;
|
||||
|
||||
@@ -4,6 +4,7 @@ const _ = require('lodash');
|
||||
const ReaderWorker = require('../core/Reader/ReaderWorker');//singleton
|
||||
const JembaReaderStorage = require('../core/Reader/JembaReaderStorage');//singleton
|
||||
const WorkerState = require('../core/WorkerState');//singleton
|
||||
const BUCClient = require('../core/BookUpdateChecker/BUCClient');//singleton
|
||||
const log = new (require('../core/AppLogger'))().log;//singleton
|
||||
const utils = require('../core/utils');
|
||||
|
||||
@@ -19,6 +20,10 @@ class WebSocketController {
|
||||
this.readerWorker = new ReaderWorker(config);
|
||||
this.workerState = new WorkerState();
|
||||
|
||||
if (config.bucEnabled) {
|
||||
this.bucClient = new BUCClient(config);
|
||||
}
|
||||
|
||||
this.wss = wss;
|
||||
|
||||
wss.on('connection', (ws) => {
|
||||
@@ -76,6 +81,8 @@ class WebSocketController {
|
||||
await this.uploadFileBuf(req, ws); break;
|
||||
case 'upload-file-touch':
|
||||
await this.uploadFileTouch(req, ws); break;
|
||||
case 'check-buc':
|
||||
await this.checkBuc(req, ws); break;
|
||||
|
||||
default:
|
||||
throw new Error(`Action not found: ${req.action}`);
|
||||
@@ -179,6 +186,21 @@ class WebSocketController {
|
||||
|
||||
this.send({url: await this.readerWorker.uploadFileTouch(req.url)}, req, ws);
|
||||
}
|
||||
|
||||
async checkBuc(req, ws) {
|
||||
if (!this.config.bucEnabled)
|
||||
throw new Error('BookUpdateChecker disabled');
|
||||
|
||||
if (!req.bookUrls)
|
||||
throw new Error(`key 'bookUrls' is empty`);
|
||||
|
||||
if (!Array.isArray(req.bookUrls))
|
||||
throw new Error(`key 'bookUrls' must be array`);
|
||||
|
||||
const data = await this.bucClient.checkBuc(req.bookUrls);
|
||||
|
||||
this.send({state: 'success', data}, req, ws);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = WebSocketController;
|
||||
|
||||
@@ -0,0 +1,262 @@
|
||||
const WebSocketConnection = require('../WebSocketConnection');
|
||||
const JembaConnManager = require('../../db/JembaConnManager');//singleton
|
||||
|
||||
const ayncExit = new (require('../AsyncExit'))();
|
||||
const utils = require('../utils');
|
||||
const log = new (require('../AppLogger'))().log;//singleton
|
||||
|
||||
const minuteMs = 60*1000;
|
||||
const hourMs = 60*minuteMs;
|
||||
const dayMs = 24*hourMs;
|
||||
|
||||
let instance = null;
|
||||
|
||||
//singleton
|
||||
class BUCClient {
|
||||
constructor(config) {
|
||||
if (!instance) {
|
||||
this.config = config;
|
||||
|
||||
this.connManager = new JembaConnManager();
|
||||
this.appDb = this.connManager.db['app'];
|
||||
|
||||
this.wsc = new WebSocketConnection(config.bucServer.url, 10, 30, {rejectUnauthorized: false});
|
||||
this.accessToken = config.bucServer.accessToken;
|
||||
|
||||
//константы
|
||||
if (this.config.branch !== 'development') {
|
||||
this.cleanQueryInterval = 300*dayMs;//интервал очистки устаревших
|
||||
this.syncPeriod = 1*hourMs;//период синхронизации с сервером BUC
|
||||
this.sendBookUrlsPeriod = 1*minuteMs;//период отправки BookUrls на сервер BUC
|
||||
} else {
|
||||
this.cleanQueryInterval = 300*dayMs;//интервал очистки устаревших
|
||||
this.syncPeriod = 1*minuteMs;//период синхронизации с сервером BUC
|
||||
this.sendBookUrlsPeriod = 1*1000;//период отправки BookUrls на сервер BUC
|
||||
}
|
||||
|
||||
this.fromCheckTime = 1;
|
||||
this.bookUrls = new Set();
|
||||
|
||||
this.main();//no await
|
||||
|
||||
instance = this;
|
||||
}
|
||||
|
||||
return instance;
|
||||
}
|
||||
|
||||
async wsRequest(query) {
|
||||
const response = await this.wsc.message(
|
||||
await this.wsc.send(Object.assign({accessToken: this.accessToken}, query), 60),
|
||||
60
|
||||
);
|
||||
if (response.error)
|
||||
throw new Error(response.error);
|
||||
return response;
|
||||
}
|
||||
|
||||
async wsGetBuc(fromCheckTime, callback) {
|
||||
const requestId = await this.wsc.send({accessToken: this.accessToken, action: 'get-buc', fromCheckTime}, 60);
|
||||
while (1) {//eslint-disable-line
|
||||
const res = await this.wsc.message(requestId, 60);
|
||||
|
||||
if (res.state == 'get') {
|
||||
await callback(res.rows);
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async wsUpdateBuc(bookUrls) {
|
||||
return await this.wsRequest({action: 'update-buc', bookUrls});
|
||||
}
|
||||
|
||||
async checkBuc(bookUrls) {
|
||||
const db = this.appDb;
|
||||
|
||||
for (const url of bookUrls)
|
||||
this.bookUrls.add(url);
|
||||
|
||||
const rows = await db.select({
|
||||
table: 'buc',
|
||||
map: `(r) => ({id: r.id, size: r.size})`,
|
||||
where: `@@id(${db.esc(bookUrls)})`,
|
||||
});
|
||||
|
||||
return rows;
|
||||
}
|
||||
|
||||
async findMaxCheckTime() {
|
||||
const db = this.appDb;
|
||||
|
||||
let result = 1;
|
||||
|
||||
//одним куском, возможно будет жрать память
|
||||
const rows = await db.select({
|
||||
table: 'buc',
|
||||
where: `
|
||||
const result = new Set();
|
||||
let max = 0;
|
||||
let maxId = null;
|
||||
|
||||
@iter(@all(), (row) => {
|
||||
if (row.checkTime > max) {
|
||||
max = row.checkTime;
|
||||
maxId = row.id;
|
||||
}
|
||||
});
|
||||
|
||||
if (maxId)
|
||||
result.add(maxId);
|
||||
|
||||
return result;
|
||||
`
|
||||
});
|
||||
|
||||
if (rows.length)
|
||||
result = rows[0].checkTime;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
async periodicSendBookUrls() {
|
||||
while (1) {//eslint-disable-line
|
||||
try {
|
||||
//отправим this.bookUrls
|
||||
if (this.bookUrls.size) {
|
||||
log(`client: remote update buc begin`);
|
||||
|
||||
const arr = Array.from(this.bookUrls);
|
||||
this.bookUrls = new Set();
|
||||
|
||||
const chunkSize = 100;
|
||||
let updated = 0;
|
||||
for (let i = 0; i < arr.length; i += chunkSize) {
|
||||
const chunk = arr.slice(i, i + chunkSize);
|
||||
|
||||
const res = await this.wsUpdateBuc(chunk);
|
||||
if (!res.error && res.state == 'success') {
|
||||
//update success
|
||||
updated += chunk.length;
|
||||
} else {
|
||||
for (const url of chunk) {
|
||||
this.bookUrls.add(url);
|
||||
}
|
||||
log(LM_ERR, `update-buc error: ${(res.error ? res.error : `wrong state "${res.state}"`)}`);
|
||||
}
|
||||
}
|
||||
log(`client: remote update buc end, updated ${updated} urls`);
|
||||
}
|
||||
} catch (e) {
|
||||
log(LM_ERR, e.stack);
|
||||
}
|
||||
|
||||
await utils.sleep(this.sendBookUrlsPeriod);
|
||||
}
|
||||
}
|
||||
|
||||
async periodicSync() {
|
||||
const db = this.appDb;
|
||||
|
||||
while (1) {//eslint-disable-line
|
||||
try {
|
||||
//почистим нашу таблицу 'buc'
|
||||
log(`client: clean 'buc' table begin`);
|
||||
const cleanTime = Date.now() - this.cleanQueryInterval;
|
||||
while (1) {//eslint-disable-line
|
||||
//выборка всех по кусочкам
|
||||
const rows = await db.select({
|
||||
table: 'buc',
|
||||
where: `
|
||||
let iter = @getItem('clean');
|
||||
if (!iter) {
|
||||
iter = @all();
|
||||
@setItem('clean', iter);
|
||||
}
|
||||
|
||||
const ids = new Set();
|
||||
let id = iter.next();
|
||||
while (!id.done) {
|
||||
ids.add(id.value);
|
||||
if (ids.size >= 1000)
|
||||
break;
|
||||
id = iter.next();
|
||||
}
|
||||
|
||||
return ids;
|
||||
`
|
||||
});
|
||||
|
||||
if (rows.length) {
|
||||
const toDelIds = [];
|
||||
for (const row of rows)
|
||||
if (row.queryTime <= cleanTime)
|
||||
toDelIds.push(row.id);
|
||||
|
||||
//удаление
|
||||
const res = await db.delete({
|
||||
table: 'buc',
|
||||
where: `@@id(${db.esc(toDelIds)})`,
|
||||
});
|
||||
|
||||
log(`client: clean 'buc' deleted ${res.deleted}`);
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
await db.select({
|
||||
table: 'buc',
|
||||
where: `
|
||||
@delItem('clean');
|
||||
return new Set();
|
||||
`
|
||||
});
|
||||
|
||||
log(`client: clean 'buc' table end`);
|
||||
|
||||
//синхронизация с сервером BUC
|
||||
log(`client: sync 'buc' table begin`);
|
||||
this.fromCheckTime -= 30*minuteMs;//минус полчаса на всякий случай
|
||||
await this.wsGetBuc(this.fromCheckTime, async(rows) => {
|
||||
for (const row of rows) {
|
||||
if (row.checkTime > this.fromCheckTime)
|
||||
this.fromCheckTime = row.checkTime;
|
||||
}
|
||||
|
||||
const res = await db.insert({
|
||||
table: 'buc',
|
||||
replace: true,
|
||||
rows
|
||||
});
|
||||
|
||||
log(`client: sync 'buc' table, inserted ${res.inserted} rows, replaced ${res.replaced}`);
|
||||
});
|
||||
log(`client: sync 'buc' table end`);
|
||||
} catch (e) {
|
||||
log(LM_ERR, e.stack);
|
||||
}
|
||||
|
||||
await utils.sleep(this.syncPeriod);
|
||||
}
|
||||
}
|
||||
|
||||
async main() {
|
||||
try {
|
||||
if (!this.config.bucEnabled)
|
||||
throw new Error('BookUpdateChecker disabled');
|
||||
|
||||
this.fromCheckTime = await this.findMaxCheckTime();
|
||||
|
||||
this.periodicSendBookUrls();//no await
|
||||
this.periodicSync();//no await
|
||||
|
||||
log(`BUC Client Worker started`);
|
||||
} catch (e) {
|
||||
log(LM_FATAL, e.stack);
|
||||
ayncExit.exit(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = BUCClient;
|
||||
@@ -1,24 +1,355 @@
|
||||
const fs = require('fs-extra');
|
||||
|
||||
const FileDownloader = require('../FileDownloader');
|
||||
const JembaConnManager = require('../../db/JembaConnManager');//singleton
|
||||
|
||||
const ayncExit = new (require('../AsyncExit'))();
|
||||
const utils = require('../utils');
|
||||
const log = new (require('../AppLogger'))().log;//singleton
|
||||
|
||||
const minuteMs = 60*1000;
|
||||
const hourMs = 60*minuteMs;
|
||||
const dayMs = 24*hourMs;
|
||||
|
||||
let instance = null;
|
||||
|
||||
//singleton
|
||||
class BUCServer {
|
||||
constructor(config) {
|
||||
if (!instance) {
|
||||
this.config = Object.assign({}, config);
|
||||
this.config = config;
|
||||
|
||||
//константы
|
||||
if (this.config.branch !== 'development') {
|
||||
this.maxCheckQueueLength = 10000;//максимальная длина checkQueue
|
||||
this.fillCheckQueuePeriod = 1*minuteMs;//период пополнения очереди
|
||||
this.periodicCheckWait = 500;//пауза, если нечего делать
|
||||
|
||||
this.cleanQueryInterval = 300*dayMs;//интервал очистки устаревших
|
||||
this.oldQueryInterval = 14*dayMs;//интервал устаревания запроса на обновление
|
||||
this.checkingInterval = 5*hourMs;//интервал проверки обновления одного и того же файла
|
||||
this.sameHostCheckInterval = 1000;//интервал проверки файла на том же сайте, не менее
|
||||
} else {
|
||||
this.maxCheckQueueLength = 10;//максимальная длина checkQueue
|
||||
this.fillCheckQueuePeriod = 10*1000;//период пополнения очереди
|
||||
this.periodicCheckWait = 500;//пауза, если нечего делать
|
||||
|
||||
this.cleanQueryInterval = 300*dayMs;//интервал очистки устаревших
|
||||
this.oldQueryInterval = 30*dayMs;//интервал устаревания запроса на обновление
|
||||
this.checkingInterval = 30*1000;//интервал проверки обновления одного и того же файла
|
||||
this.sameHostCheckInterval = 1000;//интервал проверки файла на том же сайте, не менее
|
||||
}
|
||||
|
||||
|
||||
this.config.tempDownloadDir = `${config.tempDir}/download`;
|
||||
fs.ensureDirSync(this.config.tempDownloadDir);
|
||||
|
||||
this.down = new FileDownloader(config.maxUploadFileSize);
|
||||
this.down = new FileDownloader(config.maxUploadFileSize);
|
||||
|
||||
this.connManager = new JembaConnManager();
|
||||
this.db = this.connManager.db['book-update-server'];
|
||||
|
||||
this.checkQueue = [];
|
||||
this.hostChecking = {};
|
||||
|
||||
this.main(); //no await
|
||||
|
||||
instance = this;
|
||||
}
|
||||
|
||||
return instance;
|
||||
}
|
||||
}
|
||||
|
||||
async getBuc(fromCheckTime, callback) {
|
||||
const db = this.db;
|
||||
|
||||
const iterName = utils.randomHexString(30);
|
||||
|
||||
while (1) {//eslint-disable-line
|
||||
const rows = await db.select({
|
||||
table: 'buc',
|
||||
where: `
|
||||
let iter = @getItem(${db.esc(iterName)});
|
||||
if (!iter) {
|
||||
iter = @dirtyIndexLR('checkTime', ${db.esc(fromCheckTime)});
|
||||
iter = iter.values();
|
||||
@setItem(${db.esc(iterName)}, iter);
|
||||
}
|
||||
|
||||
const ids = new Set();
|
||||
let id = iter.next();
|
||||
while (!id.done) {
|
||||
ids.add(id.value);
|
||||
if (ids.size >= 100)
|
||||
break;
|
||||
id = iter.next();
|
||||
}
|
||||
|
||||
return ids;
|
||||
`
|
||||
});
|
||||
|
||||
if (rows.length)
|
||||
callback(rows);
|
||||
else
|
||||
break;
|
||||
}
|
||||
|
||||
await db.select({
|
||||
table: 'buc',
|
||||
where: `
|
||||
@delItem(${db.esc(iterName)});
|
||||
return new Set();
|
||||
`
|
||||
});
|
||||
}
|
||||
|
||||
async updateBuc(bookUrls) {
|
||||
const db = this.db;
|
||||
const now = Date.now();
|
||||
|
||||
const rows = await db.select({
|
||||
table: 'buc',
|
||||
map: `(r) => ({id: r.id})`,
|
||||
where: `@@id(${db.esc(bookUrls)})`
|
||||
});
|
||||
|
||||
const exists = new Set();
|
||||
for (const row of rows) {
|
||||
exists.add(row.id);
|
||||
}
|
||||
|
||||
const toUpdateIds = [];
|
||||
const toInsertRows = [];
|
||||
for (let id of bookUrls) {
|
||||
if (!id)
|
||||
continue;
|
||||
|
||||
if (id.length > 1000) {
|
||||
id = id.substring(0, 1000);
|
||||
}
|
||||
|
||||
if (exists.has(id)) {
|
||||
toUpdateIds.push(id);
|
||||
} else {
|
||||
toInsertRows.push({
|
||||
id,
|
||||
queryTime: now,
|
||||
checkTime: 0, // 0 - never checked
|
||||
etag: '',
|
||||
modTime: '',
|
||||
size: 0,
|
||||
checkSum: '', //sha256
|
||||
state: 0, // 0 - not processing, 1 - processing
|
||||
error: '',
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
if (toUpdateIds.length) {
|
||||
await db.update({
|
||||
table: 'buc',
|
||||
mod: `(r) => r.queryTime = ${db.esc(now)}`,
|
||||
where: `@@id(${db.esc(toUpdateIds)})`
|
||||
});
|
||||
}
|
||||
|
||||
if (toInsertRows.length) {
|
||||
await db.insert({
|
||||
table: 'buc',
|
||||
ignore: true,
|
||||
rows: toInsertRows,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async fillCheckQueue() {
|
||||
const db = this.db;
|
||||
|
||||
while (1) {//eslint-disable-line
|
||||
try {
|
||||
let now = Date.now();
|
||||
|
||||
//чистка совсем устаревших
|
||||
let rows = await db.select({
|
||||
table: 'buc',
|
||||
where: `@@dirtyIndexLR('queryTime', undefined, ${db.esc(now - this.cleanQueryInterval)})`
|
||||
});
|
||||
|
||||
if (rows.length) {
|
||||
const ids = rows.map((r) => r.id);
|
||||
const res = await db.delete({
|
||||
table: 'buc',
|
||||
where: `@@id(${db.esc(ids)})`,
|
||||
});
|
||||
|
||||
log(LM_WARN, `clean 'buc' table: deleted ${res.deleted}`);
|
||||
}
|
||||
|
||||
rows = await db.select({table: 'buc', count: true});
|
||||
log(LM_WARN, `'buc' table size: ${rows[0].count}`);
|
||||
|
||||
now = Date.now();
|
||||
//выборка кандидатов
|
||||
rows = await db.select({
|
||||
table: 'buc',
|
||||
where: `
|
||||
@@and(
|
||||
@dirtyIndexLR('queryTime', ${db.esc(now - this.oldQueryInterval)}),
|
||||
@dirtyIndexLR('checkTime', undefined, ${db.esc(now - this.checkingInterval)}),
|
||||
@flag('notProcessing')
|
||||
);
|
||||
`
|
||||
});
|
||||
|
||||
//формирование checkQueue
|
||||
if (rows.length) {
|
||||
const ids = [];
|
||||
const rowsToPush = [];
|
||||
|
||||
//сначала выберем сколько надо
|
||||
for (const row of rows) {
|
||||
if (this.checkQueue.length + rowsToPush.length >= this.maxCheckQueueLength)
|
||||
break;
|
||||
|
||||
rowsToPush.push(row);
|
||||
ids.push(row.id);
|
||||
}
|
||||
|
||||
//установим у них флаг "в обработке"
|
||||
await db.update({
|
||||
table: 'buc',
|
||||
mod: `(r) => r.state = 1`,
|
||||
where: `@@id(${db.esc(ids)})`
|
||||
});
|
||||
|
||||
//пушим в очередь, после этого их обработает periodicCheck
|
||||
for (const row of rowsToPush) {
|
||||
this.checkQueue.push(row);
|
||||
log(LM_INFO, ` add ${row.id}`);
|
||||
}
|
||||
|
||||
log(LM_WARN, `checkQueue: added ${ids.length} recs, total ${this.checkQueue.length}`);
|
||||
}
|
||||
} catch(e) {
|
||||
log(LM_ERR, e.stack);
|
||||
}
|
||||
|
||||
await utils.sleep(this.fillCheckQueuePeriod);
|
||||
}
|
||||
}
|
||||
|
||||
async periodicCheck() {
|
||||
const db = this.db;
|
||||
|
||||
while (1) {//eslint-disable-line
|
||||
try {
|
||||
if (!this.checkQueue.length)
|
||||
await utils.sleep(this.periodicCheckWait);
|
||||
|
||||
if (!this.checkQueue.length)
|
||||
continue;
|
||||
|
||||
const row = this.checkQueue.shift();
|
||||
|
||||
const url = new URL(row.id);
|
||||
|
||||
//только если обращались к тому же хосту не ранее sameHostCheckInterval миллисекунд назад
|
||||
if (!this.hostChecking[url.hostname]) {
|
||||
this.hostChecking[url.hostname] = true;
|
||||
|
||||
try {
|
||||
let unchanged = true;
|
||||
let hash = '';
|
||||
|
||||
const headers = await this.down.head(row.id);
|
||||
|
||||
const etag = headers['etag'] || '';
|
||||
const modTime = headers['last-modified'] || '';
|
||||
let size = parseInt(headers['content-length'], 10) || 0;
|
||||
|
||||
//log(row.id);
|
||||
//log(`etag: ${etag}, modTime: ${modTime}, size: ${size}`)
|
||||
|
||||
if ((!etag || !row.etag || (etag !== row.etag))
|
||||
&& (!modTime || !row.modTime || (modTime !== row.modTime))
|
||||
&& (!size || !row.size || (size !== row.size))
|
||||
) {
|
||||
|
||||
const downdata = await this.down.load(row.id);
|
||||
|
||||
size = downdata.length;
|
||||
hash = await utils.getBufHash(downdata, 'sha256', 'hex');
|
||||
unchanged = false;
|
||||
}
|
||||
|
||||
await db.update({
|
||||
table: 'buc',
|
||||
mod: `(r) => {
|
||||
r.checkTime = ${db.esc(Date.now())};
|
||||
r.etag = ${(unchanged ? 'r.etag' : db.esc(etag))};
|
||||
r.modTime = ${(unchanged ? 'r.modTime' : db.esc(modTime))};
|
||||
r.size = ${(unchanged ? 'r.size' : db.esc(size))};
|
||||
r.checkSum = ${(unchanged ? 'r.checkSum' : db.esc(hash))};
|
||||
r.state = 0;
|
||||
r.error = '';
|
||||
}`,
|
||||
where: `@@id(${db.esc(row.id)})`
|
||||
});
|
||||
|
||||
if (unchanged) {
|
||||
log(`checked ${row.id} > unchanged`);
|
||||
} else {
|
||||
log(`checked ${row.id} > size ${size}`);
|
||||
}
|
||||
} catch (e) {
|
||||
await db.update({
|
||||
table: 'buc',
|
||||
mod: `(r) => {
|
||||
r.checkTime = ${db.esc(Date.now())};
|
||||
r.state = 0;
|
||||
r.error = ${db.esc(e.message)};
|
||||
}`,
|
||||
where: `@@id(${db.esc(row.id)})`
|
||||
});
|
||||
|
||||
log(LM_ERR, `error ${row.id} > ${e.stack ? e.stack : e.message}`);
|
||||
} finally {
|
||||
(async() => {
|
||||
await utils.sleep(this.sameHostCheckInterval);
|
||||
this.hostChecking[url.hostname] = false;
|
||||
})();
|
||||
}
|
||||
} else {
|
||||
this.checkQueue.push(row);
|
||||
}
|
||||
} catch(e) {
|
||||
log(LM_ERR, e.stack);
|
||||
}
|
||||
|
||||
await utils.sleep(10);
|
||||
}
|
||||
}
|
||||
|
||||
async main() {
|
||||
try {
|
||||
//обнуляем все статусы
|
||||
await this.db.update({table: 'buc', mod: `(r) => r.state = 0`});
|
||||
|
||||
this.fillCheckQueue();//no await
|
||||
|
||||
//10 потоков
|
||||
for (let i = 0; i < 10; i++)
|
||||
this.periodicCheck();//no await
|
||||
|
||||
log(`-------------------------`);
|
||||
log(`BUC Server Worker started`);
|
||||
log(`-------------------------`);
|
||||
} catch (e) {
|
||||
log(LM_FATAL, e.stack);
|
||||
ayncExit.exit(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = BUCServer;
|
||||
module.exports = BUCServer;
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
const https = require('https');
|
||||
const axios = require('axios');
|
||||
const utils = require('./utils');
|
||||
|
||||
const userAgent = 'Mozilla/5.0 (X11; HasCodingOs 1.0; Linux x64) AppleWebKit/637.36 (KHTML, like Gecko) Chrome/70.0.3112.101 Safari/637.36 HasBrowser/5.0';
|
||||
|
||||
class FileDownloader {
|
||||
constructor(limitDownloadSize = 0) {
|
||||
@@ -10,8 +14,12 @@ class FileDownloader {
|
||||
|
||||
const options = {
|
||||
headers: {
|
||||
'user-agent': 'Mozilla/5.0 (X11; HasCodingOs 1.0; Linux x64) AppleWebKit/637.36 (KHTML, like Gecko) Chrome/70.0.3112.101 Safari/637.36 HasBrowser/5.0'
|
||||
'user-agent': userAgent,
|
||||
timeout: 300*1000,
|
||||
},
|
||||
httpsAgent: new https.Agent({
|
||||
rejectUnauthorized: false // решение проблемы 'unable to verify the first certificate' для некоторых сайтов с валидным сертификатом
|
||||
}),
|
||||
responseType: 'stream',
|
||||
};
|
||||
|
||||
@@ -62,25 +70,54 @@ class FileDownloader {
|
||||
}
|
||||
}
|
||||
|
||||
streamToBuffer(stream, progress) {
|
||||
async head(url) {
|
||||
const options = {
|
||||
headers: {
|
||||
'user-agent': userAgent,
|
||||
timeout: 10*1000,
|
||||
},
|
||||
};
|
||||
|
||||
const res = await axios.head(url, options);
|
||||
return res.headers;
|
||||
}
|
||||
|
||||
streamToBuffer(stream, progress, timeout = 30*1000) {
|
||||
return new Promise((resolve, reject) => {
|
||||
|
||||
if (!progress)
|
||||
progress = () => {};
|
||||
|
||||
const _buf = [];
|
||||
let resolved = false;
|
||||
let timer = 0;
|
||||
|
||||
stream.on('data', (chunk) => {
|
||||
timer = 0;
|
||||
_buf.push(chunk);
|
||||
progress(chunk);
|
||||
});
|
||||
stream.on('end', () => resolve(Buffer.concat(_buf)));
|
||||
stream.on('end', () => {
|
||||
resolved = true;
|
||||
timer = timeout;
|
||||
resolve(Buffer.concat(_buf));
|
||||
});
|
||||
stream.on('error', (err) => {
|
||||
reject(err);
|
||||
});
|
||||
stream.on('aborted', () => {
|
||||
reject(new Error('aborted'));
|
||||
});
|
||||
|
||||
//бодяга с timer и timeout, чтобы гарантировать отсутствие зависания по каким-либо причинам
|
||||
(async() => {
|
||||
while (timer < timeout) {
|
||||
await utils.sleep(1000);
|
||||
timer += 1000;
|
||||
}
|
||||
if (!resolved)
|
||||
reject(new Error('FileDownloader: timed out'))
|
||||
})();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,12 +6,16 @@ const WorkerState = require('../WorkerState');//singleton
|
||||
const FileDownloader = require('../FileDownloader');
|
||||
const FileDecompressor = require('../FileDecompressor');
|
||||
const BookConverter = require('./BookConverter');
|
||||
const RemoteWebDavStorage = require('../RemoteWebDavStorage');
|
||||
const RemoteStorage = require('../RemoteStorage');
|
||||
const JembaConnManager = require('../../db/JembaConnManager');//singleton
|
||||
const ayncExit = new (require('../AsyncExit'))();
|
||||
|
||||
const utils = require('../utils');
|
||||
const log = new (require('../AppLogger'))().log;//singleton
|
||||
|
||||
const cleanDirPeriod = 30*60*1000;//раз в полчаса
|
||||
const cleanDirPeriod = 60*60*1000;//каждый час
|
||||
const remoteSendPeriod = 119*1000;//примерно раз 2 минуты
|
||||
|
||||
const queue = new LimitedQueue(5, 100, 2*60*1000 + 15000);//2 минуты ожидание подвижек
|
||||
|
||||
let instance = null;
|
||||
@@ -33,27 +37,37 @@ class ReaderWorker {
|
||||
this.decomp = new FileDecompressor(3*config.maxUploadFileSize);
|
||||
this.bookConverter = new BookConverter(this.config);
|
||||
|
||||
this.remoteWebDavStorage = false;
|
||||
if (config.remoteWebDavStorage) {
|
||||
this.remoteWebDavStorage = new RemoteWebDavStorage(
|
||||
Object.assign({maxContentLength: 3*config.maxUploadFileSize}, config.remoteWebDavStorage)
|
||||
this.connManager = new JembaConnManager();
|
||||
this.appDb = this.connManager.db['app'];
|
||||
|
||||
this.remoteStorage = false;
|
||||
if (config.remoteStorage) {
|
||||
this.remoteStorage = new RemoteStorage(
|
||||
Object.assign({maxContentLength: 3*config.maxUploadFileSize}, config.remoteStorage)
|
||||
);
|
||||
}
|
||||
|
||||
this.remoteConfig = {
|
||||
'/tmp': {
|
||||
this.dirConfigArr = [
|
||||
{
|
||||
dir: this.config.tempPublicDir,
|
||||
remoteDir: '/tmp',
|
||||
maxSize: this.config.maxTempPublicDirSize,
|
||||
moveToRemote: true,
|
||||
},
|
||||
'/upload': {
|
||||
{
|
||||
dir: this.config.uploadDir,
|
||||
remoteDir: '/upload',
|
||||
maxSize: this.config.maxUploadPublicDirSize,
|
||||
moveToRemote: true,
|
||||
}
|
||||
};
|
||||
];
|
||||
//преобразуем в объект для большего удобства
|
||||
this.dirConfig = {};
|
||||
for (const configRec of this.dirConfigArr)
|
||||
this.dirConfig[configRec.remoteDir] = configRec;
|
||||
|
||||
this.periodicCleanDir(this.remoteConfig);//no await
|
||||
this.remoteFilesToSend = [];
|
||||
this.periodicCleanDir();//no await
|
||||
|
||||
instance = this;
|
||||
}
|
||||
@@ -69,6 +83,7 @@ class ReaderWorker {
|
||||
let convertFilename = '';
|
||||
|
||||
const overLoadMes = 'Слишком большая очередь загрузки. Пожалуйста, попробуйте позже.';
|
||||
const fileNotFoundMes = 'Файл не найден';
|
||||
const overLoadErr = new Error(overLoadMes);
|
||||
|
||||
let q = null;
|
||||
@@ -91,6 +106,7 @@ class ReaderWorker {
|
||||
const tempFilename2 = utils.randomHexString(30);
|
||||
const decompDirname = utils.randomHexString(30);
|
||||
|
||||
let downloadSize = -1;
|
||||
//download or use uploaded
|
||||
if (url.indexOf('disk://') != 0) {//download
|
||||
const downdata = await this.down.load(url, (progress) => {
|
||||
@@ -98,6 +114,8 @@ class ReaderWorker {
|
||||
}, q.abort);
|
||||
|
||||
downloadedFilename = `${this.config.tempDownloadDir}/${tempFilename}`;
|
||||
|
||||
downloadSize = downdata.length;
|
||||
await fs.writeFile(downloadedFilename, downdata);
|
||||
} else {//uploaded file
|
||||
const fileHash = url.substr(7);
|
||||
@@ -152,29 +170,48 @@ class ReaderWorker {
|
||||
|
||||
//finish
|
||||
const finishFilename = path.basename(compFilename);
|
||||
wState.finish({path: `/tmp/${finishFilename}`, size: stat.size});
|
||||
|
||||
const result = {path: `/tmp/${finishFilename}`, size: stat.size};
|
||||
if (downloadSize >= 0)
|
||||
result.downloadSize = downloadSize;
|
||||
|
||||
wState.finish(result);
|
||||
|
||||
//асинхронно через 30 сек добавим в очередь на отправку
|
||||
//т.к. gzipFileIfNotExists может переупаковать файл
|
||||
(async() => {
|
||||
await utils.sleep(30*1000);
|
||||
this.pushRemoteSend(compFilename, '/tmp');
|
||||
})();
|
||||
|
||||
} catch (e) {
|
||||
log(LM_ERR, `url: ${url}, downloadedFilename: ${downloadedFilename}`);
|
||||
log(LM_ERR, e.stack);
|
||||
let mes = e.message.split('|FORLOG|');
|
||||
if (mes[1])
|
||||
log(LM_ERR, mes[0] + mes[1]);
|
||||
log(LM_ERR, `downloadedFilename: ${downloadedFilename}`);
|
||||
|
||||
mes = mes[0];
|
||||
if (mes == 'abort')
|
||||
mes = overLoadMes;
|
||||
if (mes.indexOf('ENOTDIR') >= 0)
|
||||
mes = fileNotFoundMes;
|
||||
|
||||
wState.set({state: 'error', error: mes});
|
||||
} finally {
|
||||
//clean
|
||||
if (q)
|
||||
q.ret();
|
||||
if (decompDir)
|
||||
await fs.remove(decompDir);
|
||||
if (downloadedFilename && !isUploaded)
|
||||
await fs.remove(downloadedFilename);
|
||||
if (convertFilename)
|
||||
await fs.remove(convertFilename);
|
||||
try {
|
||||
if (q)
|
||||
q.ret();
|
||||
if (decompDir)
|
||||
await fs.remove(decompDir);
|
||||
if (downloadedFilename && !isUploaded)
|
||||
await fs.remove(downloadedFilename);
|
||||
if (convertFilename)
|
||||
await fs.remove(convertFilename);
|
||||
} catch (e) {
|
||||
log(LM_ERR, `Remove error: ${e.stack}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -194,6 +231,7 @@ class ReaderWorker {
|
||||
|
||||
if (!await fs.pathExists(outFilename)) {
|
||||
await fs.move(file.path, outFilename);
|
||||
this.pushRemoteSend(outFilename, '/upload');
|
||||
} else {
|
||||
await utils.touchFile(outFilename);
|
||||
await fs.remove(file.path);
|
||||
@@ -208,6 +246,7 @@ class ReaderWorker {
|
||||
|
||||
if (!await fs.pathExists(outFilename)) {
|
||||
await fs.writeFile(outFilename, buf);
|
||||
this.pushRemoteSend(outFilename, '/upload');
|
||||
} else {
|
||||
await utils.touchFile(outFilename);
|
||||
}
|
||||
@@ -225,8 +264,8 @@ class ReaderWorker {
|
||||
|
||||
async restoreRemoteFile(filename, remoteDir) {
|
||||
let targetDir = '';
|
||||
if (this.remoteConfig[remoteDir])
|
||||
targetDir = this.remoteConfig[remoteDir].dir;
|
||||
if (this.dirConfig[remoteDir])
|
||||
targetDir = this.dirConfig[remoteDir].dir;
|
||||
else
|
||||
throw new Error(`restoreRemoteFile: unknown remoteDir value (${remoteDir})`);
|
||||
|
||||
@@ -235,8 +274,8 @@ class ReaderWorker {
|
||||
|
||||
if (!await fs.pathExists(targetName)) {
|
||||
let found = false;
|
||||
if (this.remoteWebDavStorage) {
|
||||
found = await this.remoteWebDavStorage.getFileSuccess(targetName, remoteDir);
|
||||
if (this.remoteStorage) {
|
||||
found = await this.remoteStorage.getFileSuccess(targetName, remoteDir);
|
||||
}
|
||||
|
||||
if (!found) {
|
||||
@@ -247,13 +286,57 @@ class ReaderWorker {
|
||||
return targetName;
|
||||
}
|
||||
|
||||
async cleanDir(dir, remoteDir, maxSize, moveToRemote) {
|
||||
if (!this.remoteSent)
|
||||
this.remoteSent = {};
|
||||
if (!this.remoteSent[remoteDir])
|
||||
this.remoteSent[remoteDir] = {};
|
||||
pushRemoteSend(fileName, remoteDir) {
|
||||
if (this.remoteStorage
|
||||
&& this.dirConfig[remoteDir]
|
||||
&& this.dirConfig[remoteDir].moveToRemote) {
|
||||
this.remoteFilesToSend.push({fileName, remoteDir});
|
||||
}
|
||||
}
|
||||
|
||||
const sent = this.remoteSent[remoteDir];
|
||||
async remoteSendFile(sendFileRec) {
|
||||
const {fileName, remoteDir} = sendFileRec;
|
||||
const sent = this.remoteSent;
|
||||
|
||||
if (!fileName || sent[fileName])
|
||||
return;
|
||||
|
||||
log(`remoteSendFile ${remoteDir}/${path.basename(fileName)}`);
|
||||
|
||||
//отправляем в remoteStorage
|
||||
await this.remoteStorage.putFile(fileName, remoteDir);
|
||||
|
||||
sent[fileName] = true;
|
||||
await this.appDb.insert({table: 'remote_sent', ignore: true, rows: [{id: fileName, remoteDir}]});
|
||||
}
|
||||
|
||||
async remoteSendAll() {
|
||||
if (!this.remoteStorage)
|
||||
return;
|
||||
|
||||
const newSendQueue = [];
|
||||
while (this.remoteFilesToSend.length) {
|
||||
const sendFileRec = this.remoteFilesToSend.shift();
|
||||
|
||||
if (sendFileRec.remoteDir
|
||||
&& this.dirConfig[sendFileRec.remoteDir]
|
||||
&& this.dirConfig[sendFileRec.remoteDir].moveToRemote) {
|
||||
|
||||
try {
|
||||
await this.remoteSendFile(sendFileRec);
|
||||
} catch (e) {
|
||||
newSendQueue.push(sendFileRec)
|
||||
log(LM_ERR, e.stack);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this.remoteFilesToSend = newSendQueue;
|
||||
}
|
||||
|
||||
async cleanDir(config) {
|
||||
const {dir, remoteDir, maxSize, moveToRemote} = config;
|
||||
const sent = this.remoteSent;
|
||||
|
||||
const list = await fs.readdir(dir);
|
||||
|
||||
@@ -267,24 +350,35 @@ class ReaderWorker {
|
||||
files.push({name: filePath, stat});
|
||||
}
|
||||
}
|
||||
log(`clean dir ${dir}, maxSize=${maxSize}, found ${files.length} files, total size=${size}`);
|
||||
|
||||
log(LM_WARN, `clean dir ${dir}, maxSize=${maxSize}, found ${files.length} files, total size=${size}`);
|
||||
|
||||
files.sort((a, b) => a.stat.mtimeMs - b.stat.mtimeMs);
|
||||
|
||||
if (moveToRemote && this.remoteWebDavStorage) {
|
||||
//удаленное хранилище
|
||||
if (moveToRemote && this.remoteStorage) {
|
||||
const foundFiles = new Set();
|
||||
for (const file of files) {
|
||||
if (sent[file.name])
|
||||
continue;
|
||||
foundFiles.add(file.name);
|
||||
|
||||
//отправляем в remoteWebDavStorage
|
||||
//отсылаем на всякий случай перед удалением, если вдруг remoteSendAll не справился
|
||||
try {
|
||||
log(`remoteWebDavStorage.putFile ${remoteDir}/${path.basename(file.name)}`);
|
||||
await this.remoteWebDavStorage.putFile(file.name, remoteDir);
|
||||
sent[file.name] = true;
|
||||
await this.remoteSendFile({fileName: file.name, remoteDir});
|
||||
} catch (e) {
|
||||
log(LM_ERR, e.stack);
|
||||
}
|
||||
}
|
||||
|
||||
//почистим remoteSent и БД
|
||||
//несколько неоптимально, таскает все записи из таблицы
|
||||
const rows = await this.appDb.select({table: 'remote_sent'});
|
||||
for (const row of rows) {
|
||||
if ((row.remoteDir === remoteDir && !foundFiles.has(row.id))
|
||||
|| !this.dirConfig[row.remoteDir]) {
|
||||
delete sent[row.id];
|
||||
await this.appDb.delete({table: 'remote_sent', where: `@@id(${this.appDb.esc(row.id)})`});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let i = 0;
|
||||
@@ -294,7 +388,9 @@ class ReaderWorker {
|
||||
const oldFile = file.name;
|
||||
|
||||
//реально удаляем только если сохранили в хранилище или размер dir увеличен в 1.5 раза
|
||||
if ((moveToRemote && this.remoteWebDavStorage && sent[oldFile]) || size > maxSize*1.5) {
|
||||
if (!(moveToRemote && this.remoteStorage)
|
||||
|| (moveToRemote && this.remoteStorage && sent[oldFile])
|
||||
|| size > maxSize*1.5) {
|
||||
await fs.remove(oldFile);
|
||||
j++;
|
||||
}
|
||||
@@ -302,20 +398,55 @@ class ReaderWorker {
|
||||
size -= file.stat.size;
|
||||
i++;
|
||||
}
|
||||
log(`removed ${j} files`);
|
||||
|
||||
log(LM_WARN, `removed ${j} files`);
|
||||
}
|
||||
|
||||
async periodicCleanDir(cleanConfig) {
|
||||
while (1) {// eslint-disable-line no-constant-condition
|
||||
for (const [remoteDir, config] of Object.entries(cleanConfig)) {
|
||||
try {
|
||||
await this.cleanDir(config.dir, remoteDir, config.maxSize, config.moveToRemote);
|
||||
} catch(e) {
|
||||
log(LM_ERR, e.stack);
|
||||
async periodicCleanDir() {
|
||||
try {
|
||||
if (!this.remoteSent)
|
||||
this.remoteSent = {};
|
||||
|
||||
//инициализация this.remoteSent
|
||||
if (this.remoteStorage) {
|
||||
const rows = await this.appDb.select({table: 'remote_sent'});
|
||||
for (const row of rows) {
|
||||
this.remoteSent[row.id] = true;
|
||||
}
|
||||
}
|
||||
|
||||
await utils.sleep(cleanDirPeriod);
|
||||
let lastCleanDirTime = 0;
|
||||
let lastRemoteSendTime = 0;
|
||||
while (1) {// eslint-disable-line no-constant-condition
|
||||
//отсылка в удаленное хранилище
|
||||
if (Date.now() - lastRemoteSendTime >= remoteSendPeriod) {
|
||||
try {
|
||||
await this.remoteSendAll();
|
||||
} catch(e) {
|
||||
log(LM_ERR, e.stack);
|
||||
}
|
||||
|
||||
lastRemoteSendTime = Date.now();
|
||||
}
|
||||
|
||||
//чистка папок
|
||||
if (Date.now() - lastCleanDirTime >= cleanDirPeriod) {
|
||||
for (const config of Object.values(this.dirConfig)) {
|
||||
try {
|
||||
await this.cleanDir(config);
|
||||
} catch(e) {
|
||||
log(LM_ERR, e.stack);
|
||||
}
|
||||
}
|
||||
|
||||
lastCleanDirTime = Date.now();
|
||||
}
|
||||
|
||||
await utils.sleep(60*1000);//интервал проверки 1 минута
|
||||
}
|
||||
} catch (e) {
|
||||
log(LM_FATAL, e.message);
|
||||
ayncExit.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
98
server/core/RemoteStorage.js
Normal file
98
server/core/RemoteStorage.js
Normal file
@@ -0,0 +1,98 @@
|
||||
const fs = require('fs-extra');
|
||||
const path = require('path');
|
||||
|
||||
const WebSocketConnection = require('./WebSocketConnection');
|
||||
|
||||
class RemoteStorage {
|
||||
constructor(config) {
|
||||
this.config = Object.assign({}, config);
|
||||
this.config.maxContentLength = this.config.maxContentLength || 10*1024*1024;
|
||||
|
||||
this.accessToken = this.config.accessToken;
|
||||
|
||||
this.wsc = new WebSocketConnection(config.url, 10, 30, {rejectUnauthorized: false});
|
||||
}
|
||||
|
||||
async wsRequest(query) {
|
||||
const response = await this.wsc.message(
|
||||
await this.wsc.send(Object.assign({accessToken: this.accessToken}, query), 600),
|
||||
600
|
||||
);
|
||||
if (response.error)
|
||||
throw new Error(response.error);
|
||||
return response;
|
||||
}
|
||||
|
||||
async wsStat(fileName) {
|
||||
return await this.wsRequest({action: 'get-stat', fileName});
|
||||
}
|
||||
|
||||
async wsGetFile(fileName) {
|
||||
return this.wsRequest({action: 'get-file', fileName});
|
||||
}
|
||||
|
||||
async wsPutFile(fileName, data) {//data base64 encoded string
|
||||
return this.wsRequest({action: 'put-file', fileName, data});
|
||||
}
|
||||
|
||||
async wsDelFile(fileName) {
|
||||
return this.wsRequest({action: 'del-file', fileName});
|
||||
}
|
||||
|
||||
makeRemoteFileName(fileName, dir = '') {
|
||||
const base = path.basename(fileName);
|
||||
if (base.length > 3) {
|
||||
return `${dir}/${base.substr(0, 3)}/${base}`;
|
||||
} else {
|
||||
return `${dir}/${base}`;
|
||||
}
|
||||
}
|
||||
|
||||
async putFile(fileName, dir = '') {
|
||||
if (!await fs.pathExists(fileName)) {
|
||||
throw new Error(`File not found: ${fileName}`);
|
||||
}
|
||||
|
||||
const remoteFilename = this.makeRemoteFileName(fileName, dir);
|
||||
|
||||
try {
|
||||
const localStat = await fs.stat(fileName);
|
||||
let remoteStat = await this.wsStat(remoteFilename);
|
||||
remoteStat = remoteStat.stat;
|
||||
|
||||
if (remoteStat.isFile && localStat.size == remoteStat.size) {
|
||||
return;
|
||||
}
|
||||
|
||||
await this.wsDelFile(remoteFilename);
|
||||
} catch (e) {
|
||||
//
|
||||
}
|
||||
|
||||
const data = await fs.readFile(fileName, 'base64');
|
||||
await this.wsPutFile(remoteFilename, data);
|
||||
}
|
||||
|
||||
async getFile(fileName, dir = '') {
|
||||
if (await fs.pathExists(fileName)) {
|
||||
return;
|
||||
}
|
||||
|
||||
const remoteFilename = this.makeRemoteFileName(fileName, dir);
|
||||
|
||||
const response = await this.wsGetFile(remoteFilename);
|
||||
await fs.writeFile(fileName, response.data, 'base64');
|
||||
}
|
||||
|
||||
async getFileSuccess(filename, dir = '') {
|
||||
try {
|
||||
await this.getFile(filename, dir);
|
||||
return true;
|
||||
} catch (e) {
|
||||
//
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = RemoteStorage;
|
||||
@@ -8,10 +8,13 @@ const cleanPeriod = 5*1000;//5 секунд
|
||||
|
||||
class WebSocketConnection {
|
||||
//messageLifeTime в секундах (проверка каждый cleanPeriod интервал)
|
||||
constructor(url, openTimeoutSecs = 10, messageLifeTimeSecs = 30) {
|
||||
constructor(url, openTimeoutSecs = 10, messageLifeTimeSecs = 30, webSocketOptions = {}) {
|
||||
this.WebSocket = (isBrowser ? WebSocket : require('ws'));
|
||||
this.url = url;
|
||||
this.webSocketOptions = webSocketOptions;
|
||||
|
||||
this.ws = null;
|
||||
|
||||
this.listeners = [];
|
||||
this.messageQueue = [];
|
||||
this.messageLifeTime = messageLifeTimeSecs*1000;
|
||||
@@ -91,7 +94,7 @@ class WebSocketConnection {
|
||||
const url = this.url || `${protocol}//${window.location.host}/ws`;
|
||||
this.ws = new this.WebSocket(url);
|
||||
} else {
|
||||
this.ws = new this.WebSocket(this.url);
|
||||
this.ws = new this.WebSocket(this.url, this.webSocketOptions);
|
||||
}
|
||||
|
||||
const onopen = () => {
|
||||
|
||||
@@ -25,7 +25,7 @@ class WorkerState {
|
||||
return {
|
||||
set: state => this.setState(workerId, state),
|
||||
finish: state => this.finishState(workerId, state),
|
||||
get: workerId => this.getState(workerId),
|
||||
get: () => this.getState(workerId),
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
//TODO: удалить модуль в 2023г
|
||||
const fs = require('fs-extra');
|
||||
|
||||
const SqliteConnectionPool = require('./SqliteConnectionPool');
|
||||
const log = new (require('../core/AppLogger'))().log;//singleton
|
||||
|
||||
const migrations = {
|
||||
'app': require('./migrations/app'),
|
||||
'readerStorage': require('./migrations/readerStorage'),
|
||||
};
|
||||
|
||||
let instance = null;
|
||||
|
||||
//singleton
|
||||
class ConnManager {
|
||||
constructor() {
|
||||
if (!instance) {
|
||||
this.inited = false;
|
||||
|
||||
instance = this;
|
||||
}
|
||||
|
||||
return instance;
|
||||
}
|
||||
|
||||
async init(config) {
|
||||
this.config = config;
|
||||
this._pool = {};
|
||||
|
||||
const force = null;//(config.branch == 'development' ? 'last' : null);
|
||||
|
||||
for (const poolConfig of this.config.db) {
|
||||
const dbFileName = this.config.dataDir + '/' + poolConfig.fileName;
|
||||
|
||||
//бэкап
|
||||
if (!poolConfig.noBak && await fs.pathExists(dbFileName))
|
||||
await fs.copy(dbFileName, `${dbFileName}.bak`);
|
||||
|
||||
const connPool = new SqliteConnectionPool();
|
||||
await connPool.open(poolConfig, dbFileName);
|
||||
|
||||
log(`Opened database "${poolConfig.poolName}"`);
|
||||
//миграции
|
||||
const migs = migrations[poolConfig.poolName];
|
||||
if (migs && migs.data.length) {
|
||||
const applied = await connPool.migrate(migs.data, migs.table, force);
|
||||
if (applied.length)
|
||||
log(`${applied.length} migrations applied to "${poolConfig.poolName}"`);
|
||||
}
|
||||
|
||||
this._pool[poolConfig.poolName] = connPool;
|
||||
}
|
||||
this.inited = true;
|
||||
}
|
||||
|
||||
get pool() {
|
||||
return this._pool;
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = ConnManager;
|
||||
@@ -1,42 +0,0 @@
|
||||
//TODO: удалить модуль в 2023г
|
||||
const fs = require('fs-extra');
|
||||
const log = new (require('../core/AppLogger'))().log;//singleton
|
||||
|
||||
class Converter {
|
||||
async run(config) {
|
||||
log('Converter start');
|
||||
|
||||
try {
|
||||
const connManager = new (require('./ConnManager'))();//singleton
|
||||
const storagePool = connManager.pool.readerStorage;
|
||||
|
||||
const jembaConnManager = new (require('./JembaConnManager'))();//singleton
|
||||
const db = jembaConnManager.db['reader-storage'];
|
||||
|
||||
const srcDbPath = `${config.dataDir}/reader-storage.sqlite`;
|
||||
if (!await fs.pathExists(srcDbPath)) {
|
||||
log(LM_WARN, ' Source DB does not exist, nothing to do');
|
||||
return;
|
||||
}
|
||||
|
||||
const rows = await db.select({table: 'storage', count: true});
|
||||
if (rows.length && rows[0].count != 0) {
|
||||
log(LM_WARN, ` Destination table already exists (found ${rows[0].count} items), nothing to do`);
|
||||
return;
|
||||
}
|
||||
|
||||
const dbSrc = await storagePool.get();
|
||||
try {
|
||||
const rows = await dbSrc.all(`SELECT * FROM storage`);
|
||||
await db.insert({table: 'storage', rows});
|
||||
log(` Inserted ${rows.length} items`);
|
||||
} finally {
|
||||
dbSrc.ret();
|
||||
}
|
||||
} finally {
|
||||
log('Converter finish');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Converter;
|
||||
@@ -31,7 +31,29 @@ class JembaConnManager {
|
||||
|
||||
ayncExit.add(this.close.bind(this));
|
||||
|
||||
const serverModes = new Set();
|
||||
for (const serverCfg of this.config.servers) {
|
||||
serverModes.add(serverCfg.mode);
|
||||
}
|
||||
|
||||
for (const dbConfig of this.config.jembaDb) {
|
||||
//проверка, надо ли открывать базу, зависит от serverMode
|
||||
if (dbConfig.serverMode) {
|
||||
let serverMode = dbConfig.serverMode;
|
||||
if (!Array.isArray(dbConfig.serverMode))
|
||||
serverMode = [dbConfig.serverMode];
|
||||
|
||||
let modePresent = false;
|
||||
for (const mode of serverMode) {
|
||||
modePresent = serverModes.has(mode);
|
||||
if (modePresent)
|
||||
break;
|
||||
}
|
||||
|
||||
if (!modePresent)
|
||||
continue;
|
||||
}
|
||||
|
||||
const dbPath = `${this.config.dataDir}/db/${dbConfig.dbName}`;
|
||||
|
||||
//бэкап
|
||||
|
||||
@@ -1,193 +0,0 @@
|
||||
//TODO: удалить модуль в 2023г
|
||||
const sqlite3 = require('sqlite3');
|
||||
const sqlite = require('sqlite');
|
||||
|
||||
const SQL = require('sql-template-strings');
|
||||
|
||||
class SqliteConnectionPool {
|
||||
constructor() {
|
||||
this.closed = true;
|
||||
}
|
||||
|
||||
async open(poolConfig, dbFileName) {
|
||||
const connCount = poolConfig.connCount || 1;
|
||||
const busyTimeout = poolConfig.busyTimeout || 60*1000;
|
||||
const cacheSize = poolConfig.cacheSize || 2000;
|
||||
|
||||
this.dbFileName = dbFileName;
|
||||
this.connections = [];
|
||||
this.freed = new Set();
|
||||
this.waitingQueue = [];
|
||||
|
||||
for (let i = 0; i < connCount; i++) {
|
||||
let client = await sqlite.open({
|
||||
filename: dbFileName,
|
||||
driver: sqlite3.Database
|
||||
});
|
||||
|
||||
client.configure('busyTimeout', busyTimeout); //ms
|
||||
await client.exec(`PRAGMA cache_size = ${cacheSize}`);
|
||||
|
||||
client.ret = () => {
|
||||
this.freed.add(i);
|
||||
if (this.waitingQueue.length) {
|
||||
this.waitingQueue.shift().onFreed(i);
|
||||
}
|
||||
};
|
||||
|
||||
this.freed.add(i);
|
||||
this.connections[i] = client;
|
||||
}
|
||||
this.closed = false;
|
||||
}
|
||||
|
||||
get() {
|
||||
return new Promise((resolve) => {
|
||||
if (this.closed)
|
||||
throw new Error('Connection pool closed');
|
||||
|
||||
const freeConnIndex = this.freed.values().next().value;
|
||||
if (freeConnIndex !== undefined) {
|
||||
this.freed.delete(freeConnIndex);
|
||||
resolve(this.connections[freeConnIndex]);
|
||||
return;
|
||||
}
|
||||
|
||||
this.waitingQueue.push({
|
||||
onFreed: (connIndex) => {
|
||||
this.freed.delete(connIndex);
|
||||
resolve(this.connections[connIndex]);
|
||||
},
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
async run(query) {
|
||||
const dbh = await this.get();
|
||||
try {
|
||||
let result = await dbh.run(query);
|
||||
dbh.ret();
|
||||
return result;
|
||||
} catch (e) {
|
||||
dbh.ret();
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
async all(query) {
|
||||
const dbh = await this.get();
|
||||
try {
|
||||
let result = await dbh.all(query);
|
||||
dbh.ret();
|
||||
return result;
|
||||
} catch (e) {
|
||||
dbh.ret();
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
async exec(query) {
|
||||
const dbh = await this.get();
|
||||
try {
|
||||
let result = await dbh.exec(query);
|
||||
dbh.ret();
|
||||
return result;
|
||||
} catch (e) {
|
||||
dbh.ret();
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
async close() {
|
||||
for (let i = 0; i < this.connections.length; i++) {
|
||||
await this.connections[i].close();
|
||||
}
|
||||
this.closed = true;
|
||||
}
|
||||
|
||||
// Modified from node-sqlite/.../src/Database.js
|
||||
async migrate(migs, table, force) {
|
||||
const migrations = migs.sort((a, b) => Math.sign(a.id - b.id));
|
||||
|
||||
if (!migrations.length) {
|
||||
throw new Error('No migration data');
|
||||
}
|
||||
|
||||
migrations.map(migration => {
|
||||
const data = migration.data;
|
||||
const [up, down] = data.split(/^--\s+?down\b/mi);
|
||||
if (!down) {
|
||||
const message = `The ${migration.filename} file does not contain '-- Down' separator.`;
|
||||
throw new Error(message);
|
||||
} else {
|
||||
/* eslint-disable no-param-reassign */
|
||||
migration.up = up.replace(/^-- .*?$/gm, '').trim();// Remove comments
|
||||
migration.down = down.trim(); // and trim whitespaces
|
||||
}
|
||||
});
|
||||
|
||||
// Create a database table for migrations meta data if it doesn't exist
|
||||
await this.run(`CREATE TABLE IF NOT EXISTS "${table}" (
|
||||
id INTEGER PRIMARY KEY,
|
||||
name TEXT NOT NULL,
|
||||
up TEXT NOT NULL,
|
||||
down TEXT NOT NULL
|
||||
)`);
|
||||
|
||||
// Get the list of already applied migrations
|
||||
let dbMigrations = await this.all(
|
||||
`SELECT id, name, up, down FROM "${table}" ORDER BY id ASC`,
|
||||
);
|
||||
|
||||
// Undo migrations that exist only in the database but not in migs,
|
||||
// also undo the last migration if the `force` option was set to `last`.
|
||||
const lastMigration = migrations[migrations.length - 1];
|
||||
for (const migration of dbMigrations.slice().sort((a, b) => Math.sign(b.id - a.id))) {
|
||||
if (!migrations.some(x => x.id === migration.id) ||
|
||||
(force === 'last' && migration.id === lastMigration.id)) {
|
||||
const dbh = await this.get();
|
||||
await dbh.run('BEGIN');
|
||||
try {
|
||||
await dbh.exec(migration.down);
|
||||
await dbh.run(SQL`DELETE FROM "`.append(table).append(SQL`" WHERE id = ${migration.id}`));
|
||||
await dbh.run('COMMIT');
|
||||
dbMigrations = dbMigrations.filter(x => x.id !== migration.id);
|
||||
} catch (err) {
|
||||
await dbh.run('ROLLBACK');
|
||||
throw err;
|
||||
} finally {
|
||||
dbh.ret();
|
||||
}
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// Apply pending migrations
|
||||
let applied = [];
|
||||
const lastMigrationId = dbMigrations.length ? dbMigrations[dbMigrations.length - 1].id : 0;
|
||||
for (const migration of migrations) {
|
||||
if (migration.id > lastMigrationId) {
|
||||
const dbh = await this.get();
|
||||
await dbh.run('BEGIN');
|
||||
try {
|
||||
await dbh.exec(migration.up);
|
||||
await dbh.run(SQL`INSERT INTO "`.append(table).append(
|
||||
SQL`" (id, name, up, down) VALUES (${migration.id}, ${migration.name}, ${migration.up}, ${migration.down})`)
|
||||
);
|
||||
await dbh.run('COMMIT');
|
||||
applied.push(migration.id);
|
||||
} catch (err) {
|
||||
await dbh.run('ROLLBACK');
|
||||
throw err;
|
||||
} finally {
|
||||
dbh.ret();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return applied;
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = SqliteConnectionPool;
|
||||
12
server/db/jembaMigrations/app/001-create.js
Normal file
12
server/db/jembaMigrations/app/001-create.js
Normal file
@@ -0,0 +1,12 @@
|
||||
module.exports = {
|
||||
up: [
|
||||
['create', {
|
||||
table: 'remote_sent'
|
||||
}],
|
||||
],
|
||||
down: [
|
||||
['drop', {
|
||||
table: 'remote_sent'
|
||||
}],
|
||||
]
|
||||
};
|
||||
22
server/db/jembaMigrations/app/002-create.js
Normal file
22
server/db/jembaMigrations/app/002-create.js
Normal file
@@ -0,0 +1,22 @@
|
||||
module.exports = {
|
||||
up: [
|
||||
['create', {
|
||||
/*{
|
||||
id, // book URL
|
||||
queryTime: Number,
|
||||
checkTime: Number, // 0 - never checked
|
||||
modTime: String,
|
||||
size: Number,
|
||||
checkSum: String, //sha256
|
||||
state: Number, // 0 - not processing, 1 - processing
|
||||
error: String,
|
||||
}*/
|
||||
table: 'buc'
|
||||
}],
|
||||
],
|
||||
down: [
|
||||
['drop', {
|
||||
table: 'buc'
|
||||
}],
|
||||
]
|
||||
};
|
||||
7
server/db/jembaMigrations/app/index.js
Normal file
7
server/db/jembaMigrations/app/index.js
Normal file
@@ -0,0 +1,7 @@
|
||||
module.exports = {
|
||||
table: 'migration1',
|
||||
data: [
|
||||
{id: 1, name: 'create', data: require('./001-create')},
|
||||
{id: 2, name: 'create', data: require('./002-create')},
|
||||
]
|
||||
}
|
||||
@@ -1,7 +1,20 @@
|
||||
module.exports = {
|
||||
up: [
|
||||
['create', {
|
||||
table: 'checked',
|
||||
/*{
|
||||
id, // book URL
|
||||
queryTime: Number,
|
||||
checkTime: Number, // 0 - never checked
|
||||
modTime: String,
|
||||
size: Number,
|
||||
checkSum: String, //sha256
|
||||
state: Number, // 0 - not processing, 1 - processing
|
||||
error: String,
|
||||
}*/
|
||||
table: 'buc',
|
||||
flag: [
|
||||
{name: 'notProcessing', check: `(r) => r.state === 0`},
|
||||
],
|
||||
index: [
|
||||
{field: 'queryTime', type: 'number'},
|
||||
{field: 'checkTime', type: 'number'},
|
||||
@@ -10,7 +23,7 @@ module.exports = {
|
||||
],
|
||||
down: [
|
||||
['drop', {
|
||||
table: 'checked'
|
||||
table: 'buc'
|
||||
}],
|
||||
]
|
||||
};
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
module.exports = {
|
||||
'app': require('./app'),
|
||||
'reader-storage': require('./reader-storage'),
|
||||
'book-update-server': require('./book-update-server'),
|
||||
};
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
module.exports = {
|
||||
table: 'migration1',
|
||||
data: [
|
||||
]
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
module.exports = `
|
||||
-- Up
|
||||
CREATE TABLE storage (id TEXT PRIMARY KEY, rev INTEGER, time INTEGER, data TEXT);
|
||||
|
||||
-- Down
|
||||
DROP TABLE storage;
|
||||
`;
|
||||
@@ -1,6 +0,0 @@
|
||||
module.exports = {
|
||||
table: 'migration1',
|
||||
data: [
|
||||
{id: 1, name: 'create', data: require('./001-create')}
|
||||
]
|
||||
}
|
||||
@@ -1,11 +1,11 @@
|
||||
require('tls').DEFAULT_MIN_VERSION = 'TLSv1';
|
||||
process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = 0;
|
||||
|
||||
const fs = require('fs-extra');
|
||||
const argv = require('minimist')(process.argv.slice(2));
|
||||
const express = require('express');
|
||||
const compression = require('compression');
|
||||
const http = require('http');
|
||||
const https = require('https');
|
||||
const WebSocket = require ('ws');
|
||||
|
||||
const ayncExit = new (require('./core/AsyncExit'))();
|
||||
@@ -46,15 +46,8 @@ async function init() {
|
||||
}
|
||||
|
||||
//connections
|
||||
const connManager = new (require('./db/ConnManager'))();//singleton
|
||||
await connManager.init(config);
|
||||
|
||||
const jembaConnManager = new (require('./db/JembaConnManager'))();//singleton
|
||||
await jembaConnManager.init(config, argv['auto-repair']);
|
||||
|
||||
//converter SQLITE => JembaDb
|
||||
const converter = new (require('./db/Converter'))();
|
||||
await converter.run(config);
|
||||
}
|
||||
|
||||
async function main() {
|
||||
@@ -65,7 +58,15 @@ async function main() {
|
||||
for (let serverCfg of config.servers) {
|
||||
if (serverCfg.mode !== 'none') {
|
||||
const app = express();
|
||||
const server = http.createServer(app);
|
||||
let server;
|
||||
if (serverCfg.isHttps) {
|
||||
const key = fs.readFileSync(`${config.dataDir}/${serverCfg.keysFile}.key`);
|
||||
const cert = fs.readFileSync(`${config.dataDir}/${serverCfg.keysFile}.crt`);
|
||||
|
||||
server = https.createServer({key, cert}, app);
|
||||
} else {
|
||||
server = http.createServer(app);
|
||||
}
|
||||
const wss = new WebSocket.Server({ server, maxPayload: maxPayloadSize*1024*1024 });
|
||||
|
||||
const serverConfig = Object.assign({}, config, serverCfg);
|
||||
@@ -94,7 +95,7 @@ async function main() {
|
||||
}
|
||||
|
||||
server.listen(serverConfig.port, serverConfig.ip, function() {
|
||||
log(`Server-${serverConfig.serverName} is ready on ${serverConfig.ip}:${serverConfig.port}, mode: ${serverConfig.mode}`);
|
||||
log(`Server "${serverConfig.serverName}" is ready on ${(serverConfig.isHttps ? 'https://' : 'http://')}${serverConfig.ip}:${serverConfig.port}, mode: ${serverConfig.mode}`);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -115,7 +115,7 @@ function initStatic(app, config) {
|
||||
}
|
||||
}
|
||||
} catch(e) {
|
||||
log(LM_ERR, `Static.restoreRemoteFile: ${e.message}`);
|
||||
log(LM_ERR, `static::restoreRemoteFile ${req.path} > ${e.message}`);
|
||||
}
|
||||
|
||||
return next();
|
||||
|
||||
Reference in New Issue
Block a user