refactor: move utils

src-electron/electron-main.ts

@@ -16,10 +16,10 @@ import { join } from 'upath';
 
 import { PLATFORM } from './constants';
 import { cancelAllDownloads } from './main/downloads';
-import { captureElectronError } from './main/log';
 import { initScreenListeners } from './main/screen';
 import { initSessionListeners } from './main/session';
 import { initUpdater } from './main/updater';
+import { captureElectronError } from './main/utils';
 import { closeOtherWindows, sendToWindow } from './main/window/window-base';
 import {
   authorizedClose,

src-electron/main/downloads.ts

@@ -3,8 +3,7 @@ import { ElectronDownloadManager } from 'electron-dl-manager';
 import { ensureDir } from 'fs-extra';
 import { basename } from 'upath';
 
-import { fetchJson } from './../utils';
-import { captureElectronError } from './log';
+import { captureElectronError, fetchJson } from './utils';
 import { sendToWindow } from './window/window-base';
 import { mainWindow } from './window/window-main';
 

src-electron/main/fs.ts

@@ -10,7 +10,7 @@ import {
 } from 'src/constants/media';
 import { basename, dirname, join, toUnix } from 'upath';
 
-import { captureElectronError } from './log';
+import { captureElectronError } from './utils';
 import { sendToWindow } from './window/window-base';
 import { mainWindow } from './window/window-main';
 

src-electron/main/ipc.ts

@@ -20,7 +20,6 @@ import {
 } from 'electron';
 
 import { PLATFORM } from '../constants';
-import { getAppVersion, isSelf } from './../utils';
 import { downloadFile } from './downloads';
 import {
   openFileDialog,
@@ -36,6 +35,7 @@ import {
   unregisterAllShortcuts,
   unregisterShortcut,
 } from './shortcuts';
+import { getAppVersion, isSelf } from './utils';
 import { logToWindow } from './window/window-base';
 import { mainWindow, toggleAuthorizedClose } from './window/window-main';
 import { mediaWindow, moveMediaWindow } from './window/window-media';

src-electron/main/screen.ts

@@ -2,7 +2,7 @@ import type { Display, ScreenPreferences } from 'src/types';
 
 import { app, type BrowserWindow, screen } from 'electron';
 
-import { captureElectronError } from './log';
+import { captureElectronError } from './utils';
 import { mainWindow } from './window/window-main';
 import { mediaWindow, moveMediaWindow } from './window/window-media';
 

src-electron/main/security.ts

@@ -1,6 +1,6 @@
 import { app, session, shell } from 'electron';
 
-import { isSelf, isTrustedDomain } from './../utils';
+import { isSelf, isTrustedDomain } from './utils';
 import { logToWindow } from './window/window-base';
 import { mainWindow } from './window/window-main';
 

src-electron/main/session.ts

@@ -10,7 +10,7 @@ import {
   isSelf,
   isTrustedDomain,
   isValidUrl,
-} from './../utils';
+} from './utils';
 
 export let urlVariables: undefined | UrlVariables;
 

src-electron/main/shortcuts.ts

@@ -2,7 +2,7 @@ import type { SettingsValues } from 'src/types';
 
 import { globalShortcut } from 'electron';
 
-import { captureElectronError } from './log';
+import { captureElectronError } from './utils';
 import { sendToWindow } from './window/window-base';
 import { mainWindow } from './window/window-main';
 

src-electron/main/updater.ts

@@ -4,7 +4,7 @@ import { exists } from 'fs-extra';
 import { join } from 'path';
 
 import { PLATFORM } from './../constants';
-import { captureElectronError } from './log';
+import { captureElectronError } from './utils';
 
 export async function initUpdater() {
   autoUpdater.on('error', (error, message) => {

src-electron/utils.ts → src-electron/main/utils.ts

@@ -1,9 +1,11 @@
+import type { ExclusiveEventHintOrCaptureContext } from '@sentry/core/build/types/utils/prepareEvent';
+
+import { captureException } from '@sentry/electron/main';
 import { version } from 'app/package.json';
 import { app } from 'electron';
 
-import { IS_DEV, JW_DOMAINS, TRUSTED_DOMAINS } from './constants';
-import { captureElectronError } from './main/log';
-import { urlVariables } from './main/session';
+import { IS_DEV, JW_DOMAINS, TRUSTED_DOMAINS } from './../constants';
+import { urlVariables } from './session';
 
 /**
  * Gets the current app version
@@ -154,6 +156,27 @@ export const fetchJson = async <T>(
   return null;
 };
 
+/**
+ * Logs an error to the console or to Sentry
+ * @param error The error to log
+ * @param context The context to log with the error
+ */
+export function captureElectronError(
+  error: Error | string | unknown,
+  context?: ExclusiveEventHintOrCaptureContext,
+) {
+  if (error instanceof Error && error.cause) {
+    captureElectronError(error.cause, context);
+  }
+
+  if (IS_DEV) {
+    console.error(error);
+    console.warn('context', context);
+  } else {
+    captureException(error, context);
+  }
+}
+
 /**
  * Throttles a function to only run once every `delay` milliseconds
  * @param func The function to throttle

src-electron/main/window/window-base.ts

@@ -8,8 +8,8 @@ import {
 } from 'electron';
 import { join, resolve } from 'path';
 
-import { captureElectronError } from './../log';
 import { urlVariables } from './../session';
+import { captureElectronError } from './../utils';
 import { StatefulBrowserWindow } from './window-state';
 
 export function closeOtherWindows(source: BrowserWindow) {

src-electron/main/window/window-main.ts

@@ -1,9 +1,9 @@
 import type { BrowserWindow } from 'electron';
 
 import { PLATFORM } from 'app/src-electron/constants';
-import { throttle } from 'app/src-electron/utils';
 
-import { cancelAllDownloads } from '../downloads';
+import { cancelAllDownloads } from './../downloads';
+import { throttle } from './../utils';
 import { closeOtherWindows, createWindow, sendToWindow } from './window-base';
 import { createMediaWindow, moveMediaWindow } from './window-media';
 

src-electron/main/window/window-media.ts

@@ -4,8 +4,8 @@ import type { ScreenPreferences } from 'src/types';
 import { HD_RESOLUTION, PLATFORM } from 'app/src-electron/constants';
 import { join, resolve } from 'path';
 
-import { captureElectronError } from './../log';
 import { getAllScreens, getWindowScreen, screenPreferences } from './../screen';
+import { captureElectronError } from './../utils';
 import { createWindow, sendToWindow } from './window-base';
 import { mainWindow } from './window-main';
 

src-electron/main/window/window-state.ts

@@ -8,7 +8,7 @@ import {
 import { ensureDirSync, readJsonSync, writeJsonSync } from 'fs-extra';
 import { dirname, join } from 'path';
 
-import { captureElectronError } from './../log';
+import { captureElectronError } from './../utils';
 
 interface ExtraOptions {
   /** The name of file. Defaults to `window-state.json`. */

src-electron/main/window/window-website.ts

@@ -3,7 +3,7 @@ import type { NavigateWebsiteAction } from 'src/types';
 import { HD_RESOLUTION, PLATFORM } from 'app/src-electron/constants';
 import { type BrowserWindow, systemPreferences, type Video } from 'electron';
 
-import { captureElectronError } from './../log';
+import { captureElectronError } from './../utils';
 import { createWindow, logToWindow, sendToWindow } from './window-base';
 import { mainWindow } from './window-main';