diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2021-04-19 15:58:05 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2021-09-30 14:25:48 +0200 |
| commit | 34d2d5c0cd38696f97275027147cc3a0d9e6164a (patch) | |
| tree | 69bccde44f9c8fe4484a9202910d625338da3107 /gui | |
| parent | 480fb1c2bc72d4414aa8b30f1acee3f58c2c1c14 (diff) | |
| download | mullvadvpn-34d2d5c0cd38696f97275027147cc3a0d9e6164a.tar.xz mullvadvpn-34d2d5c0cd38696f97275027147cc3a0d9e6164a.zip | |
Remove workaround for "Uncaught error" prefix
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/src/renderer/app.tsx | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx index c8950f88c8..c37f52bd4f 100644 --- a/gui/src/renderer/app.tsx +++ b/gui/src/renderer/app.tsx @@ -47,34 +47,7 @@ import { LogLevel } from '../shared/logging-types'; import IpcOutput from './lib/logging'; import { RoutePath } from './lib/routes'; -// This function wraps all IPC calls to catch errors and then rethrow them without the -// "Uncaught Error:" prefix that's added by Electron. -// This is a temporary workaround which won't be required after this Electron PR has been merged and -// released: https://github.com/electron/electron/pull/28346 -function handleReponse(ipc: typeof window.ipc): typeof window.ipc { - const wrappedIpc: Record<string, Record<string, unknown>> = {}; - - Object.entries(ipc).forEach(([groupName, group]) => { - wrappedIpc[groupName] = {} as typeof group; - - Object.entries(group).forEach(([fnName, fn]) => { - wrappedIpc[groupName][fnName] = (...args: Parameters<typeof fn>) => { - const response = fn(...args); - if (response instanceof Promise) { - return response.catch((error: Error) => { - throw new Error(error.message?.replace(/^Uncaught Error: /, '')); - }); - } else { - return response; - } - }; - }); - }); - - return wrappedIpc as typeof window.ipc; -} - -const IpcRendererEventChannel = handleReponse(window.ipc); +const IpcRendererEventChannel = window.ipc; interface IPreferredLocaleDescriptor { name: string; |
