Log refactoring

.eslintrc.js

@@ -66,7 +66,12 @@ module.exports = {
     'arrow-body-style': 'off',
     'object-curly-newline': 'warn',
     'semi': productionError,
-    'no-return-assign': 'off'
+    'no-return-assign': 'off',
+    'no-restricted-imports': ['error', {
+      name: 'electron-log',
+      importNames: ['default'],
+      message: 'You should use logging/logger instead'
+    }]
   },
 
   overrides: [

src/backend/consts.ts → src/app-globals.ts

@@ -2,7 +2,7 @@ import { app, remote } from 'electron';
 import { mkdirSync } from 'fs';
 import path from 'path';
 
-const App = app || remote.app;
+export const App = app || remote.app;
 
 if (process.env.NODE_ENV !== 'production') {
   const localUserData = path.resolve('userData');

src/backend/eventEmitters/loggerEmitter.ts

@@ -0,0 +1,13 @@
+import { BudgetTrackingEventEmitter, EventPublisher } from '@/backend/eventEmitters/EventEmitter';
+
+interface Logger {
+  info: (...params: any[]) => void
+}
+
+export function buildLoggerEmitter(logger: Logger): EventPublisher {
+  const loggerEmitter = new BudgetTrackingEventEmitter();
+  loggerEmitter.onAny((eventName, eventData) => {
+    logger.info(`${eventName}:`, eventData);
+  });
+  return loggerEmitter;
+}

src/backend/import/importTransactions.ts

@@ -1,6 +1,6 @@
+import { userDataPath } from '@/app-globals';
 import { EnrichedTransaction } from '@/backend/commonTypes';
 import * as configManager from '@/backend/configManager/configManager';
-import { userDataPath } from '@/backend/consts';
 import * as bankScraper from '@/backend/import/bankScraper';
 import { ScaperScrapingResult, Transaction } from '@/backend/import/bankScraper';
 import * as categoryCalculation from '@/backend/import/categoryCalculationScript';

src/backend/index.ts

@@ -5,8 +5,6 @@ import * as configManager from './configManager/configManager';
 import {
   BudgetTrackingEvent, BudgetTrackingEventEmitter, EventNames, EventPublisher
 } from './eventEmitters/EventEmitter';
-import { buildCompositeEventPublisher } from './eventEmitters/compositeEventPublisher';
-import { buildConsoleEmitter } from './eventEmitters/consoleEmitter';
 import outputVendors from './export/outputVendors';
 import * as bankScraper from './import/bankScraper';
 
@@ -18,7 +16,7 @@ export { BudgetTrackingEvent, BudgetTrackingEventEmitter };
 export const { inputVendors } = bankScraper;
 
 export async function scrapeAndUpdateOutputVendors(config: configManager.Config, optionalEventPublisher?: EventPublisher) {
-  const eventPublisher = createEventPublisher(optionalEventPublisher);
+  const eventPublisher = optionalEventPublisher || new BudgetTrackingEventEmitter();
 
   const startDate = moment()
     .subtract(config.scraping.numDaysBack, 'days')
@@ -37,12 +35,3 @@ export async function scrapeAndUpdateOutputVendors(config: configManager.Config,
     throw e;
   }
 }
-
-function createEventPublisher<Name>(optionalEventPublisher: EventPublisher | undefined): EventPublisher {
-  const eventPublishers = [buildConsoleEmitter()];
-  if (optionalEventPublisher) {
-    eventPublishers.push(optionalEventPublisher);
-  }
-  const compositeEventPublisher = buildCompositeEventPublisher(eventPublishers);
-  return compositeEventPublisher;
-}

src/background.ts

@@ -1,7 +1,7 @@
 import { app, BrowserWindow } from 'electron';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { createProtocol, installVueDevtools } from 'vue-cli-plugin-electron-builder/lib';
-import CreateLogger from './logging/logger';
+import logger from './logging/logger';
 import Sentry from './logging/sentry';
 // import './store';
 
@@ -13,9 +13,6 @@ const isDevelopment = process.env.NODE_ENV !== 'production';
 // be closed automatically when the JavaScript object is garbage collected.
 let mainWindow: BrowserWindow | null;
 
-global.logger = CreateLogger(app);
-const { logger } = global;
-
 function createWindow() {
   // Create the browser window.
   mainWindow = new BrowserWindow({

src/logging/logger.ts

@@ -1,29 +1,24 @@
-import { App } from 'electron';
-import logger from 'electron-log';
+import { App } from '@/app-globals';
+import logger, { LogFunctions, LogLevel } from 'electron-log'; // eslint-disable-line no-restricted-imports
 import fs from 'fs';
 import { EOL } from 'os';
 
-declare module 'electron-log' {
-  interface ElectronLog {
-    getLastLines: (n: number) => string
-  }
-}
+export type Logger = LogFunctions
+export type Levels = LogLevel
 
-export default function CreateLogger(app: App) {
-  logger.info(`Welcome to ${app.getName()} log`);
-  logger.info(`Version: ${app.getVersion()}`);
+logger.info(`Welcome to ${App.getName()} log`);
+logger.info(`Version: ${App.getVersion()}`);
 
-  const onError = (error: Error) => {
-    logger.error(error.message ? error.message : error);
-    if (error.stack) logger.debug(error.stack);
-  };
-  logger.catchErrors({ onError });
+const onError = (error: Error) => {
+  logger.error(error.message || error);
+  if (error.stack) logger.debug(error.stack);
+};
+logger.catchErrors({ onError });
 
-  logger.getLastLines = (n) => {
-    const lines = fs.readFileSync(logger.transports.file.getFile().path).toString().split(EOL);
-    const lastLines = lines.slice(lines.length - n);
-    return lastLines.join(EOL);
-  };
+export const getLastLines = (n: number) => {
+  const lines = fs.readFileSync(logger.transports.file.getFile().path).toString().split(EOL);
+  const lastLines = lines.slice(lines.length - n);
+  return lastLines.join(EOL);
+};
 
-  return logger;
-}
+export default logger as Logger;

src/main.ts

@@ -1,11 +1,9 @@
 import VueCompositionAPI, { h, ref } from '@vue/composition-api';
-import electron from 'electron';
-import { ElectronLog } from 'electron-log';
 import Vue from 'vue';
+import logger from './logging/logger';
 import Sentry from './logging/sentry';
 import App from './ui/components/App.vue';
 import SplashScreen from './ui/components/SplashScreen.vue';
-import LoggerPlugin from './ui/plugins/logger';
 import vuetify from './ui/plugins/vuetify';
 import router from './ui/router';
 import store from './ui/store';
@@ -17,10 +15,6 @@ process.on('unhandledRejection', (error) => {
   console.error(error);
 });
 
-const logger: ElectronLog = electron.remote.getGlobal('logger');
-logger.info('The renderer process got the logger');
-Vue.use(LoggerPlugin, { logger });
-
 Vue.use(VueCompositionAPI);
 
 Vue.config.productionTip = process.env.NODE_ENV !== 'production';
@@ -33,6 +27,7 @@ new Vue({
   name: APP_NAME,
 
   setup(_, { root }) {
+    logger.info('Vue started');
     const loaded = ref(false);
     root.$store.restored.then(() => {
       loaded.value = true;

src/manual/setupHelpers.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
 import { getConfig } from '@/backend/configManager/configManager';
-import { configFilePath } from '@/backend/consts';
+import { configFilePath } from '@/app-globals';
 import { getYnabAccountDetails } from '@/backend/export/outputVendors/ynab/ynab';
 import { getFinancialAccountNumbers } from '@/backend/import/importTransactions';
 

src/ui/components/App.vue

@@ -68,7 +68,7 @@
 import { shell } from 'electron';
 import Importers from '@/ui/components/app/Importers';
 import Exporters from '@/ui/components/app/Exporters';
-import { trackPage } from '@/analytics';
+import { trackPage } from '@/logging/analytics';
 import ReportProblemDialog from './app/ReportProblemDialog';
 import MainContent from './app/MainContent';
 import { repository } from '../../../package.json';

src/ui/components/app/MainContent.vue

@@ -58,8 +58,8 @@ import { scrapeAndUpdateOutputVendors, BudgetTrackingEventEmitter } from '@/back
 import { AccountsState, handleEvent } from '@/ui/components/app/accountsState';
 import store from '@/ui/store';
 import ConfigEditor from '@/ui/components/app/ConfigEditor.vue';
-import { initAnalyticsEventHandling } from '@/analytics';
-import { Levels } from '../shared/log/types';
+import { initAnalyticsEventHandling } from '@/logging/analytics';
+import logger, { Levels } from '@/logging/logger';
 
 const statusToColor = {
   NOT_STARTED: null,
@@ -117,7 +117,8 @@ export default defineComponent({
 function initEventHandlers(eventEmitter: BudgetTrackingEventEmitter, accountsState: Ref<UnwrapRef<AccountsState>>) {
   eventEmitter.onAny((eventName, eventData) => {
     const message = eventData?.message || eventName;
-    const logLevel = eventData?.error ? Levels.Error : Levels.Info;
+    const logLevel: Levels = eventData?.error ? 'error' : 'info';
+    logger[logLevel](message);
     return handleEvent({ ...eventData, message, level: logLevel }, accountsState.value);
   });
   initAnalyticsEventHandling(eventEmitter);

src/ui/components/app/ReportProblemDialog.vue

@@ -95,6 +95,7 @@ import { shell } from 'electron';
 import Sentry from '@/logging/sentry';
 import LogSheet from '@/ui/components/shared/LogSheet';
 import os from 'os';
+import { getLastLines } from '@/logging/logger';
 import { repository } from '../../../../package.json';
 
 const createGithubIssueLink = (title, details, log) => {
@@ -193,7 +194,7 @@ export default {
       }
     },
     resetForm() {
-      this.raw = this.$logger.getLastLines(10);
+      this.raw = getLastLines(10);
       this.formData = { ...defaultFormData };
       this.validateEmail = false;
     },

src/ui/components/app/accountsState.ts

@@ -1,6 +1,6 @@
 // eslint-disable-next-line max-classes-per-file
 import { BudgetTrackingEvent } from '@/backend';
-import { Levels } from '@/ui/components/shared/log/types';
+import { Levels } from '@/logging/logger';
 import { UnwrapRef } from '@vue/composition-api';
 import { AccountStatus, AccountType } from '@/backend/eventEmitters/EventEmitter';
 

src/ui/components/shared/log/LogViewer.vue

@@ -27,12 +27,12 @@
 import { defineComponent, PropType } from '@vue/composition-api';
 import { AccountsState } from '@/ui/components/app/accountsState';
 import AccountCard from '@/ui/components/shared/log/AccountCard.vue';
-import { Levels } from './types';
+import { Levels } from '@/logging/logger';
 
 const levelToClass = {
-  [Levels.Error]: 'error-line',
-  [Levels.Warn]: 'warn-line',
-  [Levels.Info]: 'info-line'
+  error: 'error-line',
+  warn: 'warn-line',
+  info: 'info-line'
 };
 
 export default defineComponent({
@@ -44,7 +44,7 @@ export default defineComponent({
     },
   },
   setup() {
-    const getClass = (level: Levels) => levelToClass[level];
+    const getClass = (level: Levels):string => levelToClass[level];
     return { getClass };
   }
 });

src/ui/store/plugins/persisted-config.ts

@@ -1,5 +1,5 @@
 import { configManager } from '@/backend';
-import { configFilePath } from '@/backend/consts';
+import { configFilePath } from '@/app-globals';
 import VuexPersistence from 'vuex-persist';
 
 export default (configModuleName: string) => new VuexPersistence<any>({