Merge branch 'release/0.8.3-4'

0.8.3-3

client/components/Reader/LoaderPage/PasteTextPage/PasteTextPage.vue

@@ -70,7 +70,7 @@ class PasteTextPage extends Vue {
     }
 
     loadBuffer() {
-        this.$emit('load-buffer', {buffer: `<cut-title>${this.bookTitle}</cut-title>${this.$refs.textArea.value}`});
+        this.$emit('load-buffer', {buffer: `<buffer><cut-title>${utils.escapeXml(this.bookTitle)}</cut-title>${this.$refs.textArea.value}</buffer>`});
         this.close();
     }
 

client/components/Reader/ProgressPage/ProgressPage.vue

@@ -47,12 +47,13 @@ class ProgressPage extends Vue {
 
     hide() {
         this.visible = false;
+        this.text = '';
     }
 
     setState(state) {
         if (state.state) {
             if (state.state == 'queue') {
-                this.text = 'Номер в очереди: ' + (state.place ? state.place : '');
+                this.text = (state.place ? 'Номер в очереди: ' + state.place : '');
             } else {
                 this.text = (ruMessage[state.state] ? ruMessage[state.state] : state.state);
             }

client/components/Reader/TextPage/TextPage.vue

@@ -27,7 +27,8 @@
         <div v-show="!clickControl && showStatusBar" class="layout" v-html="statusBarClickable" @mousedown.prevent.stop @touchstart.stop
             @click.prevent.stop="onStatusBarClick"></div>
         <!-- невидимым делать нельзя, вовремя не подгружаютя шрифты -->
-        <canvas ref="offscreenCanvas" class="layout" style="width: 0px; height: 0px"></canvas>
+        <canvas ref="offscreenCanvas" class="layout" style="visibility: hidden"></canvas>
+        <div ref="measureWidth" style="position: absolute; visibility: hidden"></div>
     </div>
 </template>
 
@@ -143,6 +144,8 @@ class TextPage extends Vue {
     }
 
     calcDrawProps() {
+        const wideLetter = 'Щ';
+
         //preloaded fonts
         this.fontList = [`12px ${this.fontName}`];
 
@@ -199,6 +202,22 @@ class TextPage extends Vue {
         this.drawHelper.lineHeight = this.lineHeight;
         this.drawHelper.context = this.context;
 
+        //альтернатива context.measureText
+        if (!this.context.measureText(wideLetter).width) {
+            const ctx = this.$refs.measureWidth;
+            this.drawHelper.measureText = function(text, style) {
+                ctx.innerText = text;
+                ctx.style.font = this.fontByStyle(style);
+                return ctx.clientWidth;
+            };
+
+            this.drawHelper.measureTextFont = function(text, font) {
+                ctx.innerText = text;
+                ctx.style.font = font;
+                return ctx.clientWidth;
+            }
+        }
+
         //statusBar
         this.statusBarClickable = this.drawHelper.statusBarClickable(this.statusBarTop, this.statusBarHeight);
 
@@ -211,8 +230,10 @@ class TextPage extends Vue {
             this.parsed.wordWrap = this.wordWrap;
             this.parsed.cutEmptyParagraphs = this.cutEmptyParagraphs;
             this.parsed.addEmptyParagraphs = this.addEmptyParagraphs;
-            let t = '';
+            let t = wideLetter;
-            while (this.drawHelper.measureText(t, {}) < this.w) t += 'Щ';
+            if (!this.drawHelper.measureText(t, {}))
+                throw new Error('Ошибка measureText');
+            while (this.drawHelper.measureText(t, {}) < this.w) t += wideLetter;
             this.parsed.maxWordLength = t.length - 1;
             this.parsed.measureText = this.drawHelper.measureText.bind(this.drawHelper);
             this.parsed.lineHeight = this.lineHeight;
@@ -368,47 +389,51 @@ class TextPage extends Vue {
 
         if (this.lastBook) {
             (async() => {
-                //подождем ленивый парсинг
+                try {
-                this.stopLazyParse = true;
+                    //подождем ленивый парсинг
-                while (this.doingLazyParse) await sleep(10);
+                    this.stopLazyParse = true;
+                    while (this.doingLazyParse) await sleep(10);
 
-                const isParsed = await bookManager.hasBookParsed(this.lastBook);
+                    const isParsed = await bookManager.hasBookParsed(this.lastBook);
-                if (!isParsed) {
+                    if (!isParsed) {
-                    return;
+                        return;
+                    }
+
+                    this.book = await bookManager.getBook(this.lastBook);
+                    this.meta = bookManager.metaOnly(this.book);
+                    this.fb2 = this.meta.fb2;
+
+                    let authorNames = [];
+                    if (this.fb2.author) {
+                        authorNames = this.fb2.author.map(a => _.compact([
+                            a.lastName,
+                            a.firstName,
+                            a.middleName
+                        ]).join(' '));
+                    }
+
+                    this.title = _.compact([
+                        authorNames.join(', '),
+                        this.fb2.bookTitle
+                    ]).join(' - ');
+
+                    this.$root.$emit('set-app-title', this.title);
+
+                    this.parsed = this.book.parsed;
+
+                    this.page1 = null;
+                    this.page2 = null;
+                    this.statusBar = null;
+                    await this.stopTextScrolling();
+
+                    await this.calcPropsAndLoadFonts();
+
+                    this.refreshTime();
+                    if (this.lazyParseEnabled)
+                        this.lazyParsePara();
+                } catch (e) {
+                    this.$alert(e.message, 'Ошибка', {type: 'error'});
                 }
-
-                this.book = await bookManager.getBook(this.lastBook);
-                this.meta = bookManager.metaOnly(this.book);
-                this.fb2 = this.meta.fb2;
-
-                let authorNames = [];
-                if (this.fb2.author) {
-                    authorNames = this.fb2.author.map(a => _.compact([
-                        a.lastName,
-                        a.firstName,
-                        a.middleName
-                    ]).join(' '));
-                }
-
-                this.title = _.compact([
-                    authorNames.join(', '),
-                    this.fb2.bookTitle
-                ]).join(' - ');
-
-                this.$root.$emit('set-app-title', this.title);
-
-                this.parsed = this.book.parsed;
-
-                this.page1 = null;
-                this.page2 = null;
-                this.statusBar = null;
-                await this.stopTextScrolling();
-
-                this.calcPropsAndLoadFonts();
-
-                this.refreshTime();
-                if (this.lazyParseEnabled)
-                    this.lazyParsePara();
             })();
         }
     }

client/share/utils.js

@@ -193,4 +193,13 @@ export function parseQuery(str) {
                 query[first] = [query[first], second]; 
     }
     return query;
+}
+
+export function escapeXml(str) {
+    return str.replace(/&/g, '&')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&apos;')
+    ;
 }

docs/omnireader/deploy.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 npm run build:linux
 sudo -u www-data cp -r ../../dist/linux/* /home/liberama

docs/omnireader/run_server.sh

@@ -1,3 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 
-sudo -H -u www-data sh -c "cd /var/www; /home/liberama/liberama"
+sudo -H -u www-data bash -c "\
+while true; do\
+  trap '' 2;\
+  cd /var/www;\
+  /home/liberama/liberama;\
+  trap 2;\
+  echo \"Restart after 5 sec. Press Ctrl+C to exit.\";\
+  sleep 5;\
+done;"

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "Liberama",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -7423,11 +7423,6 @@
         "semver": "^5.3.0"
       }
     },
-    "node-stream-zip": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.8.2.tgz",
-      "integrity": "sha512-zwP2F/R28Oqtl0gOLItk5QjJ6jEU8XO4kaUMgeqvCyXPgdCZlm8T/5qLMiNy+moJCBCiMQAaX7aVMRhT0t2vkQ=="
-    },
     "nopt": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",

package.json

@@ -71,7 +71,6 @@
     "lodash": "^4.17.15",
     "minimist": "^1.2.0",
     "multer": "^1.4.2",
-    "node-stream-zip": "^1.8.2",
     "pako": "^1.0.10",
     "path-browserify": "^1.0.0",
     "safe-buffer": "^5.2.0",

server/core/AppLogger.js

@@ -25,7 +25,8 @@ class AppLogger {
             loggerParams = [
                 {log: 'ConsoleLog'},
                 {log: 'FileLog', fileName: `${config.logDir}/${config.name}.log`},
-                {log: 'FileLog', fileName: `${config.logDir}/${config.name}.err.log`, exclude: [LM_OK, LM_INFO]},
+                {log: 'FileLog', fileName: `${config.logDir}/${config.name}.err.log`, exclude: [LM_OK, LM_INFO, LM_TOTAL]},
+                {log: 'FileLog', fileName: `${config.logDir}/${config.name}.fatal.log`, exclude: [LM_OK, LM_INFO, LM_WARN, LM_ERR, LM_TOTAL]},//LM_FATAL only
             ];
         }
 

server/core/FileDecompressor.js

@@ -3,11 +3,13 @@ const zlib = require('zlib');
 const path = require('path');
 const unbzip2Stream = require('unbzip2-stream');
 const tar = require('tar-fs');
-const ZipStreamer = require('./ZipStreamer');
+const iconv = require('iconv-lite');
 
+const ZipStreamer = require('./Zip/ZipStreamer');
 const appLogger = new (require('./AppLogger'))();//singleton
-const utils = require('./utils');
 const FileDetector = require('./FileDetector');
+const textUtils = require('./Reader/BookConverter/textUtils');
+const utils = require('./utils');
 
 class FileDecompressor {
     constructor(limitFileSize = 0) {
@@ -114,7 +116,25 @@ class FileDecompressor {
 
     async unZip(filename, outputDir) {
         const zip = new ZipStreamer();
-        return await zip.unpack(filename, outputDir, null, this.limitFileSize);
+        try {
+            return await zip.unpack(filename, outputDir, {
+                limitFileSize: this.limitFileSize, 
+                limitFileCount: 1000
+            });
+        } catch (e) {
+            fs.emptyDir(outputDir);
+            return await zip.unpack(filename, outputDir, {
+                limitFileSize: this.limitFileSize, 
+                limitFileCount: 1000,
+                decodeEntryNameCallback: (nameRaw) => {
+                    const enc = textUtils.getEncodingLite(nameRaw);
+                    if (enc.indexOf('ISO-8859') < 0) {
+                        return iconv.decode(nameRaw, enc);
+                    }
+                    return nameRaw;
+                }
+            });
+        }
     }
 
     unBz2(filename, outputDir) {

server/core/LibSharedStorage/MegaStorage.js

@@ -3,7 +3,7 @@ const fs = require('fs-extra');
 const path = require('path');
 
 const log = new (require('../AppLogger'))().log;//singleton
-const ZipStreamer = require('../ZipStreamer');
+const ZipStreamer = require('../Zip/ZipStreamer');
 
 const utils = require('../utils');
 

server/core/Logger.js

@@ -226,12 +226,12 @@ class Logger {
 
         // catch ctrl+c event and exit normally
         process.on('SIGINT', () => {
-            this.log(LM_WARN, 'Ctrl-C pressed, exiting...');
+            this.log(LM_FATAL, 'Ctrl-C pressed, exiting...');
             process.exit(2);
         });
 
         process.on('SIGTERM', () => {
-            this.log(LM_WARN, 'Kill signal, exiting...');
+            this.log(LM_FATAL, 'Kill signal, exiting...');
             process.exit(2);
         });
 

server/core/Reader/BookConverter/ConvertBase.js

@@ -1,6 +1,5 @@
 const fs = require('fs-extra');
 const iconv = require('iconv-lite');
-const chardet = require('chardet');
 const he = require('he');
 
 const LimitedQueue = require('../../LimitedQueue');
@@ -77,16 +76,6 @@ class ConvertBase {
     decode(data) {
         let selected = textUtils.getEncoding(data);
 
-        if (selected == 'ISO-8859-5') {
-            const charsetAll = chardet.detectAll(data.slice(0, 20000));
-            for (const charset of charsetAll) {
-                if (charset.name.indexOf('ISO-8859') < 0) {
-                    selected = charset.name;
-                    break;
-                }
-            }
-        }
-
         if (selected.toLowerCase() != 'utf-8')
             return iconv.decode(data, selected);
         else

server/core/Reader/BookConverter/ConvertHtml.js

@@ -6,6 +6,7 @@ class ConvertHtml extends ConvertBase {
     check(data, opts) {
         const {dataType} = opts;
 
+        //html?
         if (dataType && (dataType.ext == 'html' || dataType.ext == 'xml')) 
             return {isText: false};
 
@@ -14,6 +15,11 @@ class ConvertHtml extends ConvertBase {
             return {isText: true};
         }
 
+        //из буфера обмена?
+        if (data.toString().indexOf('<buffer>') == 0) {
+            return {isText: false};
+        }
+
         return false;
     }
 

server/core/Reader/BookConverter/textUtils.js

@@ -1,4 +1,23 @@
-function getEncoding(buf, returnAll) {
+const chardet = require('chardet');
+
+function getEncoding(buf) {
+    let selected = getEncodingLite(buf);
+
+    if (selected == 'ISO-8859-5') {
+        const charsetAll = chardet.detectAll(buf.slice(0, 20000));
+        for (const charset of charsetAll) {
+            if (charset.name.indexOf('ISO-8859') < 0) {
+                selected = charset.name;
+                break;
+            }
+        }
+    }
+
+    return selected;
+}
+
+
+function getEncodingLite(buf, returnAll) {
     const lowerCase = 3;
     const upperCase = 1;
 
@@ -106,5 +125,6 @@ function checkIfText(buf) {
 
 module.exports = {
     getEncoding,
+    getEncodingLite,
     checkIfText,
 }

server/core/Zip/ZipStreamer.js

@@ -2,7 +2,7 @@ const fs = require('fs-extra');
 const path = require('path');
 
 const zipStream = require('zip-stream');
-const unzipStream = require('node-stream-zip');
+const unzipStream = require('./node_stream_zip');
 
 class ZipStreamer {
     constructor() {
@@ -52,9 +52,15 @@ class ZipStreamer {
         })().catch(reject); });
     }
 
-    unpack(zipFile, outputDir, entryCallback, limitFileSize = 0) {
+    unpack(zipFile, outputDir, options, entryCallback) {
         return new Promise((resolve, reject) => {
             entryCallback = (entryCallback ? entryCallback : () => {});
+            const {
+                limitFileSize = 0,
+                limitFileCount = 0,
+                decodeEntryNameCallback = false,
+            } = options;
+
             const unzip = new unzipStream({file: zipFile});
 
             unzip.on('error', reject);
@@ -67,23 +73,41 @@ class ZipStreamer {
             });
 
             unzip.on('ready', () => {
-                if (limitFileSize) {
+                if (limitFileCount || limitFileSize || decodeEntryNameCallback) {
-                    for (const entry of Object.values(unzip.entries())) {
+                    const entries = Object.values(unzip.entries());
-                        if (!entry.isDirectory && entry.size > limitFileSize) {
+                    if (limitFileCount && entries.length > limitFileCount) {
+                        reject('Слишком много файлов');
+                        return;
+                    }
+
+                    for (const entry of entries) {
+                        if (limitFileSize && !entry.isDirectory && entry.size > limitFileSize) {
                             reject('Файл слишком большой');
                             return;
                         }
+
+                        if (decodeEntryNameCallback) {
+                            entry.name = (decodeEntryNameCallback(entry.nameRaw)).toString();
+                        }
                     }
                 }
 
                 unzip.extract(null, outputDir, (err) => {
-                    if (err) reject(err);
+                    if (err) {
-                    unzip.close();
+                        reject(err);
-                    resolve(files);
+                        return;
+                    }
+                    try {
+                        unzip.close();
+                        resolve(files);
+                    } catch (e) {
+                        reject(e);
+                    }
                 });
             });            
         });
     }
+
 }
 
 module.exports = ZipStreamer;