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

2 files changed, 22 insertions, 20 deletions

diff --git a/src/models/Service.js b/src/models/Service.js
index 94b907d4e..9f345375f 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -14,7 +14,8 @@ import {
   ifUndefinedNumber,
 } from '../jsUtils';
 
-const debug = require('debug')('Ferdium:Service');
+// TODO: Go back to 'debug' from 'console.log' when https://github.com/electron/electron/issues/31689 is fixed
+// const debug = require('debug')('Ferdium:Service');
 
 export default class Service {
   id = '';
@@ -305,25 +306,25 @@ export default class Service {
     // Send those headers to ipcMain so that it can be set in session
     if (typeof this.recipe.modifyRequestHeaders === 'function') {
       const modifiedRequestHeaders = this.recipe.modifyRequestHeaders();
-      debug(this.name, 'modifiedRequestHeaders', modifiedRequestHeaders);
+      console.log(this.name, 'modifiedRequestHeaders', modifiedRequestHeaders);
       ipcRenderer.send('modifyRequestHeaders', {
         modifiedRequestHeaders,
         serviceId: this.id,
       });
     } else {
-      debug(this.name, 'modifyRequestHeaders is not defined in the recipe');
+      console.log(this.name, 'modifyRequestHeaders is not defined in the recipe');
     }
 
     // if the recipe has implemented 'knownCertificateHosts'
     if (typeof this.recipe.knownCertificateHosts === 'function') {
       const knownHosts = this.recipe.knownCertificateHosts();
-      debug(this.name, 'knownCertificateHosts', knownHosts);
+      console.log(this.name, 'knownCertificateHosts', knownHosts);
       ipcRenderer.send('knownCertificateHosts', {
         knownHosts,
         serviceId: this.id,
       });
     } else {
-      debug(this.name, 'knownCertificateHosts is not defined in the recipe');
+      console.log(this.name, 'knownCertificateHosts is not defined in the recipe');
     }
 
     this.webview.addEventListener('ipc-message', async e => {
@@ -347,7 +348,7 @@ export default class Service {
     this.webview.addEventListener(
       'new-window',
       (event, url, frameName, options) => {
-        debug('new-window', event, url, frameName, options);
+        console.log('new-window', event, url, frameName, options);
         if (!isValidExternalURL(event.url)) {
           return;
         }
@@ -371,7 +372,7 @@ export default class Service {
     );
 
     this.webview.addEventListener('did-start-loading', event => {
-      debug('Did start load', this.name, event);
+      console.log('Did start load', this.name, event);
 
       this.hasCrashed = false;
       this.isLoading = true;
@@ -390,7 +391,7 @@ export default class Service {
     this.webview.addEventListener('did-navigate', didLoad.bind(this));
 
     this.webview.addEventListener('did-fail-load', event => {
-      debug('Service failed to load', this.name, event);
+      console.log('Service failed to load', this.name, event);
       if (
         event.isMainFrame &&
         event.errorCode !== -21 &&
@@ -403,33 +404,33 @@ export default class Service {
     });
 
     this.webview.addEventListener('crashed', () => {
-      debug('Service crashed', this.name);
+      console.log('Service crashed', this.name);
       this.hasCrashed = true;
     });
 
     this.webview.addEventListener('found-in-page', ({ result }) => {
-      debug('Found in page', result);
+      console.log('Found in page', result);
       this.webview.send('found-in-page', result);
     });
 
     webviewWebContents.on('login', (event, request, authInfo, callback) => {
       // const authCallback = callback;
-      debug('browser login event', authInfo);
+      console.log('browser login event', authInfo);
       event.preventDefault();
 
       if (authInfo.isProxy && authInfo.scheme === 'basic') {
-        debug('Sending service echo ping');
+        console.log('Sending service echo ping');
         webviewWebContents.send('get-service-id');
 
-        debug('Received service id', this.id);
+        console.log('Received service id', this.id);
 
         const ps = stores.settings.proxy[this.id];
 
         if (ps) {
-          debug('Sending proxy auth callback for service', this.id);
+          console.log('Sending proxy auth callback for service', this.id);
           callback(ps.user, ps.password);
         } else {
-          debug('No proxy auth config found for', this.id);
+          console.log('No proxy auth config found for', this.id);
         }
       }
     });
diff --git a/src/models/UserAgent.js b/src/models/UserAgent.js
index caacb6797..f818ee9d0 100644
--- a/src/models/UserAgent.js
+++ b/src/models/UserAgent.js
@@ -2,7 +2,8 @@ import { action, computed, observe, observable } from 'mobx';
 
 import defaultUserAgent from '../helpers/userAgent-helpers';
 
-const debug = require('debug')('Ferdium:UserAgent');
+// TODO: Go back to 'debug' from 'console.log' when https://github.com/electron/electron/issues/31689 is fixed
+// const debug = require('debug')('Ferdium:UserAgent');
 
 export default class UserAgent {
   _willNavigateListener = null;
@@ -78,7 +79,7 @@ export default class UserAgent {
   @action _handleNavigate(url, forwardingHack = false) {
     if (url.startsWith('https://accounts.google.com')) {
       if (!this.chromelessUserAgent) {
-        debug('Setting user agent to chromeless for url', url);
+        console.log('Setting user agent to chromeless for url', url);
         this.chromelessUserAgent = true;
         this.webview.userAgent = this.userAgent;
         if (forwardingHack) {
@@ -86,14 +87,14 @@ export default class UserAgent {
         }
       }
     } else if (this.chromelessUserAgent) {
-      debug('Setting user agent to contain chrome for url', url);
+      console.log('Setting user agent to contain chrome for url', url);
       this.chromelessUserAgent = false;
       this.webview.userAgent = this.userAgent;
     }
   }
 
   _addWebviewEvents(webview) {
-    debug('Adding event handlers');
+    console.log('Adding event handlers');
 
     this._willNavigateListener = event => this._handleNavigate(event.url, true);
     webview.addEventListener('will-navigate', this._willNavigateListener);
@@ -103,7 +104,7 @@ export default class UserAgent {
   }
 
   _removeWebviewEvents(webview) {
-    debug('Removing event handlers');
+    console.log('Removing event handlers');
 
     webview.removeEventListener('will-navigate', this._willNavigateListener);
     webview.removeEventListener('did-navigate', this._didNavigateListener);