From 7c77ae758b05fc709b89fe73e5fa917058885c04 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Wed, 26 Jun 2019 20:49:17 +0200
Subject: [PATCH] fix frontend reload again

---
 electron.js                                  |  2 +-
 package-lock.json                            |  8 ++++----
 package.json                                 |  2 +-
 src/public/javascripts/services/messaging.js | 11 +++++++----
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/electron.js b/electron.js
index 19469c5ae..e58039251 100644
--- a/electron.js
+++ b/electron.js
@@ -74,7 +74,7 @@ async function createMainWindow() {
         const parsedUrl = url.parse(targetUrl);
 
         // we still need to allow internal redirects from setup and migration pages
-        if (parsedUrl.hostname !== 'localhost' || parsedUrl.hostname !== '127.0.0.1' || (parsedUrl.path && parsedUrl.path !== '/')) {
+        if (!['localhost', '127.0.0.1'].includes(parsedUrl.hostname) || (parsedUrl.path && parsedUrl.path !== '/')) {
             ev.preventDefault();
         }
     });
diff --git a/package-lock.json b/package-lock.json
index ebf523b4a..302bc5192 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "trilium",
-  "version": "0.33.2-beta",
+  "version": "0.33.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2820,9 +2820,9 @@
       "integrity": "sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q=="
     },
     "electron": {
-      "version": "6.0.0-beta.10",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-6.0.0-beta.10.tgz",
-      "integrity": "sha512-eKDUv5ZZGjFE2ccBQzBpY6j3oT1NvnHGLcSoGXp6vCWkx+ZYjPyujwG3gW61FK7iL5FMKyg9IlhCOsIy4HEruw==",
+      "version": "6.0.0-beta.11",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-6.0.0-beta.11.tgz",
+      "integrity": "sha512-B6zh9c5pJ0BKKNkOEbF6vKXnBCWgtvY8LaUYDNeR9ttnPP0CCm0oovIoqP9/nN5gL8rlCoCgKWsjmiHu0jg7mA==",
       "dev": true,
       "requires": {
         "@types/node": "^10.12.18",
diff --git a/package.json b/package.json
index 9b33710f6..f99367714 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
   },
   "devDependencies": {
     "devtron": "1.4.0",
-    "electron": "6.0.0-beta.10",
+    "electron": "6.0.0-beta.11",
     "electron-builder": "20.44.2",
     "electron-compile": "6.4.4",
     "electron-installer-debian": "2.0.0",
diff --git a/src/public/javascripts/services/messaging.js b/src/public/javascripts/services/messaging.js
index a7444b376..8ecd2e081 100644
--- a/src/public/javascripts/services/messaging.js
+++ b/src/public/javascripts/services/messaging.js
@@ -88,10 +88,13 @@ setTimeout(() => {
             console.log("Lost connection to server");
         }
 
-        ws.send(JSON.stringify({
-            type: 'ping',
-            lastSyncId: lastSyncId
-        }));
+        try {
+            ws.send(JSON.stringify({
+                type: 'ping',
+                lastSyncId: lastSyncId
+            }));
+        }
+        catch (e) {} // if the connection is closed then this produces a lot of messages
     }, 1000);
 }, 0);