From 528aacfe86682df3fcb375277a5de83feaeb8e08 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Sun, 9 Jan 2022 23:34:24 +0100 Subject: build: Add eslint-plugin-promise MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kristóf Marussy --- packages/main/src/index.ts | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'packages') diff --git a/packages/main/src/index.ts b/packages/main/src/index.ts index 02e6cda..2830fa7 100644 --- a/packages/main/src/index.ts +++ b/packages/main/src/index.ts @@ -123,7 +123,9 @@ const serviceInject: WebSource = { let mainWindow: BrowserWindow | undefined; const store = createMainStore(); + init(store) + // eslint-disable-next-line promise/always-return -- `then` instead of top-level await. .then((disposeCompositionRoot) => { app.on('will-quit', disposeCompositionRoot); }) @@ -241,6 +243,15 @@ async function createWindow(): Promise { return getSnapshot(store.shared); }); + async function reloadServiceInject() { + try { + serviceInject.code = await readFile(serviceInjectPath, 'utf8'); + } catch (error) { + log.error('Error while reloading', serviceInjectPath, error); + } + browserView.webContents.reload(); + } + ipcMain.on(RendererToMainIpcMessage.DispatchAction, (event, rawAction) => { if (event.sender.id !== webContents.id) { log.warn( @@ -261,19 +272,9 @@ async function createWindow(): Promise { store.config.setThemeSource(actionToDispatch.themeSource); break; case 'reload-all-services': - readFile(serviceInjectPath, 'utf8') - .then((data) => { - serviceInject.code = data; - }) - .catch((error) => { - log.error('Error while reloading', serviceInjectPath, error); - }) - .then(() => { - browserView.webContents.reload(); - }) - .catch((error) => { - log.error('Failed to reload browserView', error); - }); + reloadServiceInject().catch((error) => { + log.error('Failed to reload browserView', error); + }); break; default: log.error('Unexpected action from UI renderer:', actionToDispatch); -- cgit v1.2.3-54-g00ecf