diff --git a/package-lock.json b/package-lock.json index ab50152f5..53df9ab4b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3345,9 +3345,9 @@ } }, "electron": { - "version": "9.0.0-beta.22", - "resolved": "https://registry.npmjs.org/electron/-/electron-9.0.0-beta.22.tgz", - "integrity": "sha512-dfqAf+CXXTKcNDj7DU7mYsmx+oZQcXOvJnZ8ZsgAHjrE9Tv8zsYUgCP3JlO4Z8CIazgleKXYmgh6H2stdK7fEA==", + "version": "9.0.0-beta.24", + "resolved": "https://registry.npmjs.org/electron/-/electron-9.0.0-beta.24.tgz", + "integrity": "sha512-25L3XMqm/1CCaV5CgU5ZkhKXw9830WeipJrTW0+VC5XTKp/3xHwhxyQ5G1kQnOTJd7IGwOamvw237D6e1YKnng==", "dev": true, "requires": { "@electron/get": "^1.0.1", diff --git a/package.json b/package.json index 7e36d93f4..ef0690863 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "yazl": "^2.5.1" }, "devDependencies": { - "electron": "9.0.0-beta.22", + "electron": "9.0.0-beta.24", "electron-builder": "22.6.0", "electron-packager": "14.2.1", "electron-rebuild": "1.10.1", diff --git a/src/public/app/services/ws.js b/src/public/app/services/ws.js index d06cac0fb..89fcdebcc 100644 --- a/src/public/app/services/ws.js +++ b/src/public/app/services/ws.js @@ -170,7 +170,7 @@ function connectWebSocket() { async function sendPing() { if (Date.now() - lastPingTs > 30000) { - console.log(utils.now(), "Lost websocket connection to the backend"); + console.log(utils.now(), "Lost websocket connection to the backend. If you keep having this issue repeatedly, you might want to check your reverse proxy (nginx, apache) configuration and allow/unblock WebSocket."); } if (ws.readyState === ws.OPEN) { @@ -374,4 +374,4 @@ export default { subscribeToMessages, waitForSyncId, waitForMaxKnownSyncId -}; \ No newline at end of file +}; diff --git a/src/views/desktop.ejs b/src/views/desktop.ejs index dd387edf2..b6f0c4938 100644 --- a/src/views/desktop.ejs +++ b/src/views/desktop.ejs @@ -5,7 +5,7 @@ Trilium Notes - +
@@ -83,9 +83,5 @@ - -