Preload safe debug shim (#29)

In https://github.com/ferdium/ferdium-app/pull/23 we removed usages of
the debug package due to an electron bug.

This patch aims to restore some debug functionality by introducing a
shim. The shim detect whether if it is being introduced in a preload
script where the electron but would be triggered, and falls back to a
simple replacement for debug. However, in the main and renderer
processes, where a preload script is not being used, we still get full
debug functionality.

In this way, a module can be used both in a preload script and outside
of it, while still preserving debug functionality whenever possible.

Signed-off-by: Kristóf Marussy <kristof@marussy.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index f1c4251ba..6d6089793 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -7,8 +7,7 @@ import { join } from 'path';
 
 import ServiceModel from '../../../models/Service';
 
-// TODO: Go back to 'debug' from 'console.log' when https://github.com/electron/electron/issues/31689 is fixed
-// const debug = require('debug')('Ferdium:Services');
+const debug = require('../../../preload-safe-debug')('Ferdium:Services');
 
 class ServiceWebview extends Component {
   static propTypes = {
@@ -28,7 +27,7 @@ class ServiceWebview extends Component {
       () => {
         if (this.webview && this.webview.view) {
           this.webview.view.addEventListener('console-message', e => {
-            console.log('Service logged a message:', e.message);
+            debug('Service logged a message:', e.message);
           });
           this.webview.view.addEventListener('did-navigate', () => {
             if (this.props.service._webview) {
@@ -51,7 +50,7 @@ class ServiceWebview extends Component {
 
   refocusWebview = () => {
     const { webview } = this;
-    console.log('Refocus Webview is called', this.props.service);
+    debug('Refocus Webview is called', this.props.service);
     if (!webview) return;
     if (this.props.service.isActive) {
       webview.view.blur();
@@ -64,7 +63,7 @@ class ServiceWebview extends Component {
         } ${`- ${this.props.service._webview.getTitle()}`}`;
       }, 100);
     } else {
-      console.log('Refocus not required - Not active service');
+      debug('Refocus not required - Not active service');
     }
   };