Merge branch 'release/0.9.3'

build/webpack.prod.config.js

@@ -9,7 +9,7 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const CleanWebpackPlugin = require('clean-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
-const SWPrecacheWebpackPlugin = require('sw-precache-webpack-plugin');
+const {GenerateSW} = require('workbox-webpack-plugin');
 
 const publicDir = path.resolve(__dirname, '../dist/tmp/public');
 const clientDir = path.resolve(__dirname, '../client');
@@ -55,12 +55,12 @@ module.exports = merge(baseWpConfig, {
             filename: `${publicDir}/index.html`
         }),
         new CopyWebpackPlugin([{from: `${clientDir}/assets/*`, to: `${publicDir}/`, flatten: true}]),
-        new SWPrecacheWebpackPlugin({
+        new GenerateSW({
             cacheId: 'liberama',
-            filepath: `${publicDir}/service-worker.js`,
-            minify: true,
+            swDest: `${publicDir}/service-worker.js`,
             navigateFallback: '/index.html',
-            stripPrefix: publicDir,
+            navigateFallbackDenylist: [new RegExp('^/api'), new RegExp('^/ws'), new RegExp('^/tmp'),],
+            skipWaiting: true,
         }),        
     ]
 });

client/components/Reader/RecentBooksPage/RecentBooksPage.vue

@@ -5,7 +5,7 @@
             <span v-if="loading"><q-spinner class="q-mr-sm" color="lime-12" size="20px" :thickness="7"/>Список загружается</span>
         </template>
 
-        <a ref="download" style='display: none;'></a>
+        <a ref="download" style='display: none;' target="_blank"></a>
 
         <q-table
             class="recent-books-table col"
@@ -298,6 +298,7 @@ class RecentBooksPage extends Vue {
             const d = this.$refs.download;
             d.href = fb2path;
             d.download = path.basename(fb2path).substr(0, 10) + '.fb2';
+
             d.click();
         } catch (e) {
             let errMes = e.message;

client/components/Reader/versionHistory.js

@@ -1,4 +1,15 @@
 export const versionHistory = [
+{
+    showUntil: '2020-05-20',
+    header: '0.9.3 (2020-05-21)',
+    content:
+`
+<ul>
+    <li>исправления багов</li>
+</ul>
+`
+},
+
 {
     showUntil: '2020-04-25',
     header: '0.9.2 (2020-03-15)',

client/components/share/StdDialog.vue

@@ -277,21 +277,30 @@ class StdDialog extends Vue {
 
     keyHook(event) {
         if (this.active) {
+            let handled = false;
             if (this.type == 'hotKey') {
                 if (event.type == 'keydown') {
                     this.hotKeyCode = utils.keyEventToCode(event);
+                    handled = true;
                 }
             } else {
-                if (event.code == 'Enter')
+                if (event.code == 'Enter') {
                     this.okClick();
+                    handled = true;
+                }
+
                 if (event.code == 'Escape') {
                     this.$nextTick(() => {
                         this.$refs.dialog.hide();
                     });
+                    handled = true;
                 }
             }
-            event.stopPropagation();
-            event.preventDefault();
+
+            if (handled) {
+                event.stopPropagation();
+                event.preventDefault();
+            }
         }
     }
 }

docs/beta.omnireader/beta.omnireader

@@ -30,7 +30,7 @@ server {
     root /home/beta.liberama/public;
 
     location /tmp {
-      add_header Content-Type text/xml;
+      types { } default_type "application/xml; charset=utf-8";
       add_header Content-Encoding gzip;
     }
 

docs/omnireader/omnireader

@@ -30,7 +30,7 @@ server {
     root /home/liberama/public;
 
     location /tmp {
-      add_header Content-Type text/xml;
+      types { } default_type "application/xml; charset=utf-8";
       add_header Content-Encoding gzip;
     }
 

docs/omnireader/omnireader_http

@@ -25,7 +25,7 @@ server {
     root /home/liberama/public;
 
     location /tmp {
-      add_header Content-Type text/xml;
+      types { } default_type "application/xml; charset=utf-8";
       add_header Content-Encoding gzip;
     }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Liberama",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "author": "Book Pauk <bookpauk@gmail.com>",
   "license": "CC0-1.0",
   "repository": "bookpauk/liberama",
@@ -41,7 +41,6 @@
     "mini-css-extract-plugin": "^0.5.0",
     "optimize-css-assets-webpack-plugin": "^5.0.3",
     "pkg": "^4.4.4",
-    "sw-precache-webpack-plugin": "^1.0.0",
     "terser-webpack-plugin": "^1.4.1",
     "url-loader": "^1.1.2",
     "vue-class-component": "^6.3.2",
@@ -52,7 +51,8 @@
     "webpack-cli": "^3.3.11",
     "webpack-dev-middleware": "^3.7.2",
     "webpack-hot-middleware": "^2.25.0",
-    "webpack-merge": "^4.2.2"
+    "webpack-merge": "^4.2.2",
+    "workbox-webpack-plugin": "^5.1.3"
   },
   "dependencies": {
     "@quasar/extras": "^1.5.2",
@@ -72,7 +72,7 @@
     "multer": "^1.4.2",
     "pako": "^1.0.11",
     "path-browserify": "^1.0.0",
-    "quasar": "^1.9.7",
+    "quasar": "^1.11.3",
     "safe-buffer": "^5.2.0",
     "sjcl": "^1.0.8",
     "sql-template-strings": "^2.2.2",

server/core/Reader/BookConverter/.gitignore

@@ -0,0 +1 @@
+test

server/index.js

@@ -72,7 +72,7 @@ async function main() {
                 maxAge: '30d',
                 setHeaders: (res, filePath) => {
                     if (path.basename(path.dirname(filePath)) == 'tmp') {
-                        res.set('Content-Type', 'text/xml');
+                        res.set('Content-Type', 'application/xml');
                         res.set('Content-Encoding', 'gzip');
                     }
                 }