|
2 | 2 | // to use depends on if the code runs in the main or renderer process.
|
3 | 3 | // It's in those modules that the correct logger instance will be imported.
|
4 | 4 | import type {
|
| 5 | + LogFunctions as ElectronLogFunctions, |
5 | 6 | Logger as ElectronLogger,
|
6 | 7 | LogLevel,
|
7 | 8 | LogMessage,
|
8 | 9 | } from 'electron-log';
|
9 | 10 | import { formatLogData } from './logger.format';
|
10 | 11 | import type { LogFunction, Logger } from './logger.types';
|
11 | 12 |
|
12 |
| -export function createLogger(scope?: string): Logger { |
13 |
| - let electronLogger: ElectronLogger; |
| 13 | +interface ElectronLogFunctionsExtended extends ElectronLogFunctions { |
| 14 | + /** |
| 15 | + * Alias for silly. |
| 16 | + */ |
| 17 | + trace: LogFunction; |
| 18 | +} |
| 19 | + |
| 20 | +/** |
| 21 | + * Get the electron-log instance to use, appropriate for |
| 22 | + * the current process (e.g. main vs. renderer). |
| 23 | + */ |
| 24 | +function getElectronLoggerInstance(): ElectronLogger { |
14 | 25 | if (typeof window === 'undefined') {
|
15 |
| - electronLogger = require('electron-log/main'); |
16 |
| - } else { |
17 |
| - electronLogger = require('electron-log/renderer'); |
| 26 | + return require('electron-log/main'); |
18 | 27 | }
|
19 |
| - return scope ? electronLogger.scope(scope) : electronLogger; |
| 28 | + return require('electron-log/renderer'); |
| 29 | +} |
| 30 | + |
| 31 | +function addTraceLevel(logger: ElectronLogger): void { |
| 32 | + if (!logger.levels.includes('trace')) { |
| 33 | + logger.addLevel('trace'); |
| 34 | + } |
| 35 | +} |
| 36 | + |
| 37 | +export function createLogger(scope?: string): Logger { |
| 38 | + const electronLogger = getElectronLoggerInstance(); |
| 39 | + |
| 40 | + addTraceLevel(electronLogger); |
| 41 | + |
| 42 | + const logger: ElectronLogFunctions = scope |
| 43 | + ? electronLogger.scope(scope) |
| 44 | + : electronLogger; |
| 45 | + |
| 46 | + // Have to cast because typescript isn't aware of the new `trace` function. |
| 47 | + const extendedLogger = logger as ElectronLogFunctionsExtended as Logger; |
| 48 | + |
| 49 | + extendedLogger.trace('created logger', { scope }); |
| 50 | + |
| 51 | + return extendedLogger; |
20 | 52 | }
|
21 | 53 |
|
22 | 54 | export function initializeLogging(logger: ElectronLogger): void {
|
|
0 commit comments