feat: better handling of 'unresponsive' event (#1952)

* refactor: replace deprecated 'crashed' event electron/electron#23096 * feat: ux element when window becomes unresponsive * style: improved helptext dedicated button labels remove any ambiguity Co-authored-by: Marcin Rataj <[email protected]>
ipfs · Feb 1, 2022 · 908c972 · 908c972
1 parent b266d9b
commit 908c972
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/assets/locales/en.json b/assets/locales/en.json
@@ -232,5 +232,11 @@
   "clearCustomIpfsBinarySuccess": {
     "title": "Clear custom IPFS binary",
     "message": "The custom IPFS binary was cleared. To start using the bundled IPFS version, IPFS needs to be restarted first."
+  },
+  "unresponsiveWindowDialog": {
+    "title": "IPFS Desktop became unresponsive",
+    "message": "Ongoing operation is taking more resources than expected. Do you wish to abort, and forcefully reload the interface?",
+    "forceReload": "Yes, reload",
+    "doNothing": "Do nothing"
   }
 }
diff --git a/src/webui/index.js b/src/webui/index.js
@@ -3,12 +3,14 @@ const { join } = require('path')
 const { URL } = require('url')
 const serve = require('electron-serve')
 const os = require('os')
+const i18n = require('i18next')
 const openExternal = require('./open-external')
 const logger = require('../common/logger')
 const store = require('../common/store')
 const dock = require('../utils/dock')
 const { VERSION, ELECTRON_VERSION } = require('../common/consts')
 const createToggler = require('../utils/create-toggler')
+const { showDialog } = require('../dialogs')
 
 serve({ scheme: 'webui', directory: join(__dirname, '../../assets/webui') })
 
@@ -38,12 +40,26 @@ const createWindow = () => {
     window.webContents.openDevTools()
   }
 
-  window.webContents.on('crashed', event => {
-    logger.error(`[web ui] crashed: ${event.toString()}`)
+  window.webContents.on('render-process-gone', (_, { reason, exitCode }) => {
+    logger.error(`[web ui] render-process-gone: ${reason}, code: ${exitCode}`)
   })
 
-  window.webContents.on('unresponsive', event => {
-    logger.error(`[web ui] unresponsive: ${event.toString()}`)
+  window.webContents.on('unresponsive', async () => {
+    logger.error('[web ui] the webui became unresponsive')
+
+    const opt = showDialog({
+      title: i18n.t('unresponsiveWindowDialog.title'),
+      message: i18n.t('unresponsiveWindowDialog.message'),
+      buttons: [
+        i18n.t('unresponsiveWindowDialog.forceReload'),
+        i18n.t('unresponsiveWindowDialog.doNothing')
+      ]
+    })
+
+    if (opt === 0) {
+      window.webContents.forcefullyCrashRenderer()
+      window.webContents.reload()
+    }
   })
 
   window.on('resize', () => {