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/download.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/electron/ipc-api/download.ts') diff --git a/src/electron/ipc-api/download.ts b/src/electron/ipc-api/download.ts index 3631e8fee..21af0d045 100644 --- a/src/electron/ipc-api/download.ts +++ b/src/electron/ipc-api/download.ts @@ -4,8 +4,7 @@ import mime from 'mime-types'; import { writeFileSync } from 'fs-extra'; import { PathLike } from 'fs'; -// TODO: Go back to 'debug' from 'console.log' when https://github.com/electron/electron/issues/31689 is fixed -// const debug = require('debug')('Ferdium:ipcApi:download'); +const debug = require('../../preload-safe-debug')('Ferdium:ipcApi:download'); function decodeBase64Image(dataString: string) { const matches = dataString.match(/^data:([+/A-Za-z-]+);base64,(.+)$/); @@ -28,7 +27,7 @@ export default (params: { mainWindow: BrowserWindow }) => { const dl = await download(win!, url, { saveAs: true, }); - console.log('File saved to', dl.savePath); + debug('File saved to', dl.savePath); } else { const extension = mime.extension(fileOptions.mime); const filename = `${fileOptions.name}.${extension}`; @@ -47,7 +46,7 @@ export default (params: { mainWindow: BrowserWindow }) => { 'binary', ); - console.log('File blob saved to', saveDialog.filePath); + debug('File blob saved to', saveDialog.filePath); } catch (error) { console.error(error); } -- cgit v1.2.3-54-g00ecf