Turn off usage of 'debug' npm package using with electron-16 (fixes #17)

1 files changed, 32 insertions, 31 deletions

diff --git a/src/index.ts b/src/index.ts
index 1721651e4..6be4f3f18 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -44,10 +44,11 @@ import { asarPath } from './helpers/asar-helpers';
 import { openExternalUrl } from './helpers/url-helpers';
 import userAgent from './helpers/userAgent-helpers';
 
-const debug = require('debug')('Ferdium:App');
+// TODO: Go back to 'debug' from 'console.log' when https://github.com/electron/electron/issues/31689 is fixed
+// const debug = require('debug')('Ferdium:App');
 
 // Globally set useragent to fix user agent override in service workers
-debug('Set userAgent to ', userAgent());
+console.log('Set userAgent to', userAgent());
 app.userAgentFallback = userAgent();
 
 // Keep a global reference of the window object, if you don't, the window will
@@ -126,7 +127,7 @@ if (!gotTheLock) {
           if (argv.includes('--reset-window')) {
             // Needs to be delayed to not interfere with mainWindow.restore();
             setTimeout(() => {
-              debug('Resetting windows via Task');
+              console.log('Resetting windows via Task');
               window.setPosition(
                 DEFAULT_WINDOW_OPTIONS.x + 100,
                 DEFAULT_WINDOW_OPTIONS.y + 100,
@@ -139,7 +140,7 @@ if (!gotTheLock) {
           } else if (argv.includes('--quit')) {
             // Needs to be delayed to not interfere with mainWindow.restore();
             setTimeout(() => {
-              debug('Quitting Ferdium via Task');
+              console.log('Quitting Ferdium via Task');
               app.quit();
             }, 1);
           }
@@ -161,7 +162,7 @@ if (
 
 // Disable GPU acceleration
 if (!retrieveSettingValue('enableGPUAcceleration', false)) {
-  debug('Disable GPU Acceleration');
+  console.log('Disable GPU Acceleration');
   app.disableHardwareAcceleration();
 }
 
@@ -183,7 +184,7 @@ const createWindow = () => {
   let posY = mainWindowState.y || DEFAULT_WINDOW_OPTIONS.y;
 
   if (!isPositionValid({ x: posX, y: posY })) {
-    debug('Window is out of screen bounds, resetting window');
+    console.log('Window is out of screen bounds, resetting window');
     posX = DEFAULT_WINDOW_OPTIONS.x;
     posY = DEFAULT_WINDOW_OPTIONS.y;
   }
@@ -284,7 +285,7 @@ const createWindow = () => {
 
   // Emitted when the window is closed.
   mainWindow.on('close', e => {
-    debug('Window: close window');
+    console.log('Window: close window');
     // Dereference the window object, usually you would store windows
     // in an array if your app supports multi windows, this is the time
     // when you should delete the corresponding element.
@@ -297,7 +298,7 @@ const createWindow = () => {
     ) {
       e.preventDefault();
       if (isWindows) {
-        debug('Window: minimize');
+        console.log('Window: minimize');
         mainWindow?.minimize();
 
         if (
@@ -306,16 +307,16 @@ const createWindow = () => {
             DEFAULT_APP_SETTINGS.closeToSystemTray,
           )
         ) {
-          debug('Skip taskbar: true');
+          console.log('Skip taskbar: true');
           mainWindow?.setSkipTaskbar(true);
         }
       } else if (isMac && mainWindow?.isFullScreen()) {
-        debug('Window: leaveFullScreen and hide');
+        console.log('Window: leaveFullScreen and hide');
         mainWindow.once('show', () => mainWindow?.setFullScreen(true));
         mainWindow.once('leave-full-screen', () => mainWindow?.hide());
         mainWindow.setFullScreen(false);
       } else {
-        debug('Window: hide');
+        console.log('Window: hide');
         mainWindow?.hide();
       }
     } else {
@@ -336,31 +337,31 @@ const createWindow = () => {
         DEFAULT_APP_SETTINGS.minimizeToSystemTray,
       )
     ) {
-      debug('Skip taskbar: true');
+      console.log('Skip taskbar: true');
       mainWindow?.setSkipTaskbar(true);
       trayIcon.show();
     }
   });
 
   mainWindow.on('maximize', () => {
-    debug('Window: maximize');
+    console.log('Window: maximize');
     // @ts-expect-error Property 'isMaximized' does not exist on type 'App'.
     app.isMaximized = true;
   });
 
   mainWindow.on('unmaximize', () => {
-    debug('Window: unmaximize');
+    console.log('Window: unmaximize');
     // @ts-expect-error Property 'isMaximized' does not exist on type 'App'.
     app.isMaximized = false;
   });
 
   mainWindow.on('restore', () => {
-    debug('Window: restore');
+    console.log('Window: restore');
     mainWindow?.setSkipTaskbar(false);
 
     // @ts-expect-error Property 'wasMaximized' does not exist on type 'App'.
     if (app.wasMaximized) {
-      debug('Window: was maximized before, maximize window');
+      console.log('Window: was maximized before, maximize window');
       mainWindow?.maximize();
     }
 
@@ -370,7 +371,7 @@ const createWindow = () => {
         DEFAULT_APP_SETTINGS.enableSystemTray,
       )
     ) {
-      debug('Tray: hiding tray icon');
+      console.log('Tray: hiding tray icon');
       trayIcon.hide();
     }
   });
@@ -382,7 +383,7 @@ const createWindow = () => {
   }
 
   mainWindow.on('show', () => {
-    debug('Skip taskbar: true');
+    console.log('Skip taskbar: true');
     mainWindow?.setSkipTaskbar(false);
   });
 
@@ -499,18 +500,18 @@ let authCallback = noop;
 app.on('login', (event, _webContents, _request, authInfo, callback) => {
   // @ts-expect-error Type '(username?: string | undefined, password?: string | undefined) => void' is not assignable to type '() => null'.
   authCallback = callback;
-  debug('browser login event', authInfo);
+  console.log('browser login event', authInfo);
   event.preventDefault();
 
   if (!authInfo.isProxy && authInfo.scheme === 'basic') {
-    debug('basic auth handler', authInfo);
+    console.log('basic auth handler', authInfo);
     basicAuthHandler(mainWindow!, authInfo);
   }
 });
 
 // TODO: evaluate if we need to store the authCallback for every service
 ipcMain.on('feature-basic-auth-credentials', (_e, { user, password }) => {
-  debug('Received basic auth credentials', user, '********');
+  console.log('Received basic auth credentials', user, '********');
 
   // @ts-expect-error Expected 0 arguments, but got 2.
   authCallback(user, password);
@@ -529,13 +530,13 @@ ipcMain.on('open-browser-window', (_e, { url, serviceId }) => {
   enableWebContents(child.webContents);
   child.show();
   child.loadURL(url);
-  debug('Received open-browser-window', url);
+  console.log('Received open-browser-window', url);
 });
 
 ipcMain.on(
   'modifyRequestHeaders',
   (_e, { modifiedRequestHeaders, serviceId }) => {
-    debug(
+    console.log(
       `Received modifyRequestHeaders ${modifiedRequestHeaders} for serviceId ${serviceId}`,
     );
     for (const headerFilterSet of modifiedRequestHeaders) {
@@ -556,7 +557,7 @@ ipcMain.on(
 );
 
 ipcMain.on('knownCertificateHosts', (_e, { knownHosts, serviceId }) => {
-  debug(
+  console.log(
     `Received knownCertificateHosts ${knownHosts} for serviceId ${serviceId}`,
   );
   session
@@ -576,7 +577,7 @@ ipcMain.on('knownCertificateHosts', (_e, { knownHosts, serviceId }) => {
 });
 
 ipcMain.on('feature-basic-auth-cancel', () => {
-  debug('Cancel basic auth');
+  console.log('Cancel basic auth');
 
   // @ts-expect-error Expected 0 arguments, but got 2.
   authCallback(null);
@@ -595,7 +596,7 @@ ipcMain.on('find-in-page', (e, text, options) => {
       }
     }
     const requestId = webContents.findInPage(text, sanitizedOptions);
-    debug('Find in page', text, options, requestId);
+    console.log('Find in page', text, options, requestId);
     e.returnValue = requestId;
   } else {
     e.returnValue = null;
@@ -624,10 +625,10 @@ ipcMain.on('set-spellchecker-locales', (_e, { locale, serviceId }) => {
 
   const serviceSession = session.fromPartition(`persist:service-${serviceId}`);
   const [defaultLocale] = serviceSession.getSpellCheckerLanguages();
-  debug(`Spellchecker default locale is: ${defaultLocale}`);
+  console.log(`Spellchecker default locale is: ${defaultLocale}`);
 
   const locales = [locale, defaultLocale, DEFAULT_APP_SETTINGS.fallbackLocale];
-  debug(`Setting spellchecker locales to: ${locales}`);
+  console.log(`Setting spellchecker locales to: ${locales}`);
   serviceSession.setSpellCheckerLanguages(locales);
 });
 
@@ -645,10 +646,10 @@ app.on('window-all-closed', () => {
       DEFAULT_APP_SETTINGS.runInBackground,
     )
   ) {
-    debug('Window: all windows closed, quit app');
+    console.log('Window: all windows closed, quit app');
     app.quit();
   } else {
-    debug("Window: don't quit app");
+    console.log("Window: don't quit app");
   }
 });
 
@@ -694,7 +695,7 @@ app.on('will-finish-launching', () => {
     event.preventDefault();
 
     onDidLoad((window: BrowserWindow) => {
-      debug('open-url event', url);
+      console.log('open-url event', url);
       handleDeepLink(window, url);
     });
   });