1 files changed, 30 insertions, 6 deletions

diff --git a/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts b/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts
index e5fdf11..d90ff19 100644
--- a/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts
+++ b/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts
@@ -22,12 +22,15 @@ import type { BrowserViewBounds } from '@sophie/shared';
 import { BrowserView } from 'electron';
 
 import type Service from '../../../stores/Service';
+import { getLogger } from '../../../utils/log';
 import type Resources from '../../resources/Resources';
 import type { ServiceView } from '../types';
 
 import ElectronPartition from './ElectronPartition';
 import type ElectronViewFactory from './ElectronViewFactory';
 
+const log = getLogger('ElectronServiceView');
+
 export default class ElectronServiceView implements ServiceView {
   readonly id: string;
 
@@ -72,20 +75,39 @@ export default class ElectronServiceView implements ServiceView {
       }
     });
 
+    webContents.on(
+      'did-fail-load',
+      (_event, errorCode, errorDesc, url, isMainFrame) => {
+        if (isMainFrame) {
+          setLocation(url);
+          service.setFailed(errorCode, errorDesc);
+          log.warn(
+            'Failed to load',
+            url,
+            'in service',
+            this.id,
+            errorCode,
+            errorDesc,
+          );
+        }
+      },
+    );
+
     webContents.on('page-title-updated', (_event, title) => {
       service.setTitle(title);
     });
 
     webContents.on('did-start-loading', () => {
-      service.startedLoading();
+      service.startLoading();
     });
 
     webContents.on('did-stop-loading', () => {
-      service.finishedLoading();
+      service.finishLoading();
     });
 
-    webContents.on('render-process-gone', () => {
-      service.crashed();
+    webContents.on('render-process-gone', (_event, details) => {
+      const { reason, exitCode } = details;
+      service.setCrashed(reason, exitCode);
     });
   }
 
@@ -93,8 +115,10 @@ export default class ElectronServiceView implements ServiceView {
     return this.browserView.webContents.id;
   }
 
-  loadURL(url: string): Promise<void> {
-    return this.browserView.webContents.loadURL(url);
+  loadURL(url: string): void {
+    this.browserView.webContents.loadURL(url).catch((error) => {
+      log.warn('Error while loading', url, 'in service', this.id, error);
+    });
   }
 
   goBack(): void {