1 files changed, 63 insertions, 46 deletions

diff --git a/packages/main/src/index.ts b/packages/main/src/index.ts
index d0191b7..bc10b4c 100644
--- a/packages/main/src/index.ts
+++ b/packages/main/src/index.ts
@@ -19,18 +19,10 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import {
-  app,
-  BrowserView,
-  BrowserWindow,
-  ipcMain,
-} from 'electron';
 import { arch } from 'os';
-import osName from 'os-name';
-import { ensureDirSync, readFile, readFileSync } from 'fs-extra';
-import { autorun } from 'mobx';
-import { getSnapshot, onPatch } from 'mobx-state-tree';
 import { join } from 'path';
+import { URL } from 'url';
+
 import {
   ServiceToMainIpcMessage,
   unreadCount,
@@ -41,18 +33,30 @@ import {
   MainToRendererIpcMessage,
   RendererToMainIpcMessage,
 } from '@sophie/shared';
-import { URL } from 'url';
+import {
+  app,
+  BrowserView,
+  BrowserWindow,
+  ipcMain,
+} from 'electron';
+import { ensureDirSync, readFile, readFileSync } from 'fs-extra';
+import { autorun } from 'mobx';
+import { getSnapshot, onPatch } from 'mobx-state-tree';
+import osName from 'os-name';
 
-import { init } from './compositionRoot';
 import {
   DEVMODE_ALLOWED_URL_PREFIXES,
   installDevToolsExtensions,
   openDevToolsWhenReady,
 } from './devTools';
+import init from './init';
 import { createMainStore } from './stores/MainStore';
+import { getLogger } from './utils/log';
 
 const isDevelopment = import.meta.env.MODE === 'development';
 
+const log = getLogger('index');
+
 // Always enable sandboxing.
 app.enableSandbox();
 
@@ -93,7 +97,7 @@ app.setAboutPanelOptions({
     `Node.js: ${process.versions.node}`,
     `Platform: ${osName()}`,
     `Arch: ${arch()}`,
-    `Build date: ${new Date(Number(import.meta.env.BUILD_DATE))}`,
+    `Build date: ${new Date(Number(import.meta.env.BUILD_DATE)).toLocaleString()}`,
     `Git SHA: ${import.meta.env.GIT_SHA}`,
     `Git branch: ${import.meta.env.GIT_BRANCH}`,
   ].join('\n'),
@@ -109,9 +113,9 @@ function getResourceUrl(relativePath: string): string {
   return new URL(relativePath, baseUrl).toString();
 }
 
-let serviceInjectRelativePath = '../../service-inject/dist/index.js';
-let serviceInjectPath = getResourcePath(serviceInjectRelativePath);
-let serviceInject: WebSource = {
+const serviceInjectRelativePath = '../../service-inject/dist/index.js';
+const serviceInjectPath = getResourcePath(serviceInjectRelativePath);
+const serviceInject: WebSource = {
   code: readFileSync(serviceInjectPath, 'utf8'),
   url: getResourceUrl(serviceInjectRelativePath),
 };
@@ -122,7 +126,7 @@ const store = createMainStore();
 init(store).then((disposeCompositionRoot) => {
   app.on('will-quit', disposeCompositionRoot);
 }).catch((err) => {
-  console.log('Failed to initialize application', err);
+  log.log('Failed to initialize application', err);
 });
 
 const rendererBaseUrl = getResourceUrl('../renderer/');
@@ -211,7 +215,7 @@ async function createWindow(): Promise<unknown> {
 
   ipcMain.handle(RendererToMainIpcMessage.GetSharedStoreSnapshot, (event) => {
     if (event.sender.id !== webContents.id) {
-      console.warn(
+      log.warn(
         'Unexpected',
         RendererToMainIpcMessage.GetSharedStoreSnapshot,
         'from webContents',
@@ -224,7 +228,7 @@ async function createWindow(): Promise<unknown> {
 
   ipcMain.on(RendererToMainIpcMessage.DispatchAction, (event, rawAction) => {
     if (event.sender.id !== webContents.id) {
-      console.warn(
+      log.warn(
         'Unexpected',
         RendererToMainIpcMessage.DispatchAction,
         'from webContents',
@@ -242,17 +246,26 @@ async function createWindow(): Promise<unknown> {
           store.config.setThemeSource(actionToDispatch.themeSource);
           break;
         case 'reload-all-services':
-          readFile(serviceInjectPath, 'utf8').then((data) => {
-            serviceInject.code = data;
-          }).catch((err) => {
-            console.error('Error while reloading', serviceInjectPath, err);
-          }).then(() => {
-            browserView.webContents.reload();
-          });
+          readFile(serviceInjectPath, 'utf8')
+            .then((data) => {
+              serviceInject.code = data;
+            })
+            .catch((err) => {
+              log.error('Error while reloading', serviceInjectPath, err);
+            })
+            .then(() => {
+              browserView.webContents.reload();
+            })
+            .catch((err) => {
+              log.error('Failed to reload browserView', err);
+            });
+          break;
+        default:
+          log.error('Unexpected action from UI renderer:', actionToDispatch);
           break;
       }
     } catch (err) {
-      console.error('Error while dispatching renderer action', rawAction, err);
+      log.error('Error while dispatching renderer action', rawAction, err);
     }
   });
 
@@ -260,11 +273,10 @@ async function createWindow(): Promise<unknown> {
     webContents.send(MainToRendererIpcMessage.SharedStorePatch, patch);
   });
 
-  ipcMain.handle(ServiceToMainIpcMessage.ApiExposedInMainWorld, (event) => {
-    return event.sender.id === browserView.webContents.id
-      ? serviceInject
-      : null;
-  });
+  ipcMain.handle(
+    ServiceToMainIpcMessage.ApiExposedInMainWorld,
+    (event) => (event.sender.id === browserView.webContents.id ? serviceInject : null),
+  );
 
   browserView.webContents.on('ipc-message', (_event, channel, ...args) => {
     try {
@@ -274,14 +286,14 @@ async function createWindow(): Promise<unknown> {
           // otherwise electron emits a no handler registered warning.
           break;
         case ServiceToMainIpcMessage.SetUnreadCount:
-          console.log('Unread count:', unreadCount.parse(args[0]));
+          log.log('Unread count:', unreadCount.parse(args[0]));
           break;
         default:
-          console.error('Unknown IPC message:', channel, args);
+          log.error('Unknown IPC message:', channel, args);
           break;
       }
     } catch (err) {
-      console.error('Error while processing IPC message:', channel, args, err);
+      log.error('Error while processing IPC message:', channel, args, err);
     }
   });
 
@@ -291,17 +303,22 @@ async function createWindow(): Promise<unknown> {
     },
   );
 
-  browserView.webContents.session.webRequest.onBeforeSendHeaders(({ url, requestHeaders }, callback) => {
-    if (url.match(/^[^:]+:\/\/accounts\.google\.[^.\/]+\//)) {
-      requestHeaders['User-Agent'] = chromelessUserAgent;
-    } else {
-      requestHeaders['User-Agent'] = userAgent;
-    }
-    callback({ requestHeaders });
-  });
+  browserView.webContents.session.webRequest.onBeforeSendHeaders(
+    ({ url, requestHeaders }, callback) => {
+      const requestUserAgent = url.match(/^[^:]+:\/\/accounts\.google\.[^./]+\//)
+        ? chromelessUserAgent
+        : userAgent;
+      callback({
+        requestHeaders: {
+          ...requestHeaders,
+          'User-Agent': requestUserAgent,
+        },
+      });
+    },
+  );
 
   browserView.webContents.loadURL('https://gitlab.com/say-hi-to-sophie/sophie').catch((err) => {
-    console.error('Failed to load browser', err);
+    log.error('Failed to load browser', err);
   });
 
   return mainWindow.loadURL(pageUrl);
@@ -330,12 +347,12 @@ app.whenReady().then(async () => {
     try {
       await installDevToolsExtensions();
     } catch (err) {
-      console.error('Failed to install devtools extensions', err);
+      log.error('Failed to install devtools extensions', err);
     }
   }
 
   return createWindow();
 }).catch((err) => {
-  console.error('Failed to create window', err);
+  log.error('Failed to create window', err);
   process.exit(1);
 });