From d02644f7c41150709795e57bfd40351b4da35a7b Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Sat, 23 Apr 2022 01:59:21 +0200 Subject: Preload safe debug shim (#29) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/electron/ipc-api/sessionStorage.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/electron/ipc-api/sessionStorage.ts') diff --git a/src/electron/ipc-api/sessionStorage.ts b/src/electron/ipc-api/sessionStorage.ts index 96acacd12..2a9f4b4d1 100644 --- a/src/electron/ipc-api/sessionStorage.ts +++ b/src/electron/ipc-api/sessionStorage.ts @@ -2,8 +2,7 @@ import { ipcMain, Session, session } from 'electron'; import { TODOS_PARTITION_ID } from '../../config'; -// TODO: Go back to 'debug' from 'console.log' when https://github.com/electron/electron/issues/31689 is fixed -// const debug = require('debug')('Ferdium:ipcApi:sessionStorage'); +const debug = require('../../preload-safe-debug')('Ferdium:ipcApi:sessionStorage'); function deduceSession(serviceId: string | undefined | null): Session { if (serviceId) { @@ -22,14 +21,14 @@ export default async () => { const serviceSession = deduceSession(serviceId); serviceSession.flushStorageData(); if (targetsToClear) { - console.log('Clearing targets:', targetsToClear); + debug('Clearing targets:', targetsToClear); serviceSession.clearStorageData(targetsToClear); } else { - console.log('Clearing all targets'); + debug('Clearing all targets'); serviceSession.clearStorageData(); } } catch (error) { - console.log(error); + debug(error); } }); -- cgit v1.2.3-70-g09d2