Now logger interface can take multiple messages.

Fixed an linting issue in the watcher. Moved watcher initialization to init method instead of constructor.
rzvxa · Oct 4, 2023 · 47e4296 · 47e4296
1 parent 80b51c2
commit 47e4296
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 32 deletions.
diff --git a/src/main/services/loggingService/index.ts b/src/main/services/loggingService/index.ts
@@ -30,32 +30,33 @@ class LoggingService implements Logger, IService {
     }
   }
 
-  trace(message: string, tags: string[] = []) {
+  trace(message: unknown | unknown[], tags: string[] = []) {
     this.log(LogLevel.trace, tags, message);
   }
 
-  debug(message: string, tags: string[] = []) {
+  debug(message: unknown | unknown[], tags: string[] = []) {
     this.log(LogLevel.debug, tags, message);
   }
 
-  info(message: string, tags: string[] = []) {
+  info(message: unknown | unknown[], tags: string[] = []) {
     this.log(LogLevel.info, tags, message);
   }
 
-  warning(message: string, tags: string[] = []) {
+  warning(message: unknown | unknown[], tags: string[] = []) {
     this.log(LogLevel.warning, tags, message);
   }
 
-  error(message: string, tags: string[] = []) {
+  error(message: unknown | unknown[], tags: string[] = []) {
     this.log(LogLevel.error, tags, message);
   }
 
-  fatal(message: string, tags: string[] = []) {
+  fatal(message: unknown | unknown[], tags: string[] = []) {
     this.log(LogLevel.fatal, tags, message);
   }
 
   log(logLevel: LogLevel, tags: string[], ...args: unknown[]) {
     const message = args.reduce((a, c) => `${a} ${c}`, '') as string;
+    console.log(message);
     const logMessage = {
       message,
       level: logLevel,

diff --git a/src/main/services/projectWatchService/index.ts b/src/main/services/projectWatchService/index.ts
@@ -1,7 +1,14 @@
 import path from 'path';
 import { watch, FSWatcher } from 'chokidar';
 import { sanitizePath } from 'shared/utils';
-import { ChannelsRenderer, ProjectTree, ProjectTreeNode } from 'shared/types';
+import {
+  LogLevel,
+  ChannelsRenderer,
+  ProjectTree,
+  ProjectTreeNode,
+} from 'shared/types';
+
+import project from 'main/project';
 
 import IService from '../IService';
 
@@ -13,15 +20,15 @@ export type ProjectWatchServiceMessageBroker = (
 const FlushInterval = 300;
 
 class ProjectWatchService implements IService {
-  #watcher: FSWatcher;
-
   #messageBroker: ProjectWatchServiceMessageBroker;
 
   #projectPath: string;
 
   #projectTree: ProjectTree;
 
-  #workerIdentifier: ReturnType<typeof setInterval>;
+  #watcher: FSWatcher | null = null;
+
+  #workerIdentifier: ReturnType<typeof setInterval> | null = null;
 
   #isDirty: boolean = false;
 
@@ -38,6 +45,9 @@ class ProjectWatchService implements IService {
       isDir: true,
       children: undefined,
     };
+  }
+
+  async init(): Promise<boolean> {
     this.#watcher = watch(this.#projectPath, {
       ignored: /^\./,
       persistent: true,
@@ -51,13 +61,10 @@ class ProjectWatchService implements IService {
       })
       .on('unlink', (_path) => this.#onUnlink(_path))
       .on('error', (error) => {
-        console.error('Error happened', error);
+        project.logger.log(LogLevel.error, ['ProjectWatchService'], error);
       });
 
     this.#workerIdentifier = setInterval(() => this.#worker(), FlushInterval);
-  }
-
-  async init(): Promise<boolean> {
     return true;
   }
 

diff --git a/src/main/utils/fileLogger.ts b/src/main/utils/fileLogger.ts
@@ -14,27 +14,27 @@ export default class FileLogger implements Logger {
     this.fileHandle = await open(this.filePath, 'a');
   }
 
-  trace(message: string, tags: string[]) {
+  trace(message: unknown | unknown[], tags: string[]) {
     this.log(LogLevel.trace, tags, message);
   }
 
-  debug(message: string, tags: string[]) {
+  debug(message: unknown | unknown[], tags: string[]) {
     this.log(LogLevel.debug, tags, message);
   }
 
-  info(message: string, tags: string[]) {
+  info(message: unknown | unknown[], tags: string[]) {
     this.log(LogLevel.info, tags, message);
   }
 
-  warning(message: string, tags: string[]) {
+  warning(message: unknown | unknown[], tags: string[]) {
     this.log(LogLevel.warning, tags, message);
   }
 
-  error(message: string, tags: string[]) {
+  error(message: unknown | unknown[], tags: string[]) {
     this.log(LogLevel.error, tags, message);
   }
 
-  fatal(message: string, tags: string[]) {
+  fatal(message: unknown | unknown[], tags: string[]) {
     this.log(LogLevel.fatal, tags, message);
   }
 

diff --git a/src/renderer/logger.ts b/src/renderer/logger.ts
@@ -1,27 +1,27 @@
 import { ChannelsMain, Logger, LogLevel } from 'shared/types';
 
 class RendererLogger implements Logger {
-  trace(message: string, tags: string[] = []) {
+  trace(message: unknown | unknown[], tags: string[] = []) {
     this.log(LogLevel.trace, tags, message);
   }
 
-  debug(message: string, tags: string[] = []) {
+  debug(message: unknown | unknown[], tags: string[] = []) {
     this.log(LogLevel.debug, tags, message);
   }
 
-  info(message: string, tags: string[] = []) {
+  info(message: unknown | unknown[], tags: string[] = []) {
     this.log(LogLevel.info, tags, message);
   }
 
-  warning(message: string, tags: string[] = []) {
+  warning(message: unknown | unknown[], tags: string[] = []) {
     this.log(LogLevel.warning, tags, message);
   }
 
-  error(message: string, tags: string[] = []) {
+  error(message: unknown | unknown[], tags: string[] = []) {
     this.log(LogLevel.error, tags, message);
   }
 
-  fatal(message: string, tags: string[] = []) {
+  fatal(message: unknown | unknown[], tags: string[] = []) {
     this.log(LogLevel.fatal, tags, message);
   }
 

diff --git a/src/shared/types/logger.ts b/src/shared/types/logger.ts
@@ -1,11 +1,11 @@
 import LogLevel from './logLevel';
 
 export default interface Logger {
-  trace: (message: string, tags: string[]) => void;
-  debug: (message: string, tags: string[]) => void;
-  info: (message: string, tags: string[]) => void;
-  warning: (message: string, tags: string[]) => void;
-  error: (message: string, tags: string[]) => void;
-  fatal: (message: string, tags: string[]) => void;
+  trace: (message: unknown | unknown[], tags: string[]) => void;
+  debug: (message: unknown | unknown[], tags: string[]) => void;
+  info: (message: unknown | unknown[], tags: string[]) => void;
+  warning: (message: unknown | unknown[], tags: string[]) => void;
+  error: (message: unknown | unknown[], tags: string[]) => void;
+  fatal: (message: unknown | unknown[], tags: string[]) => void;
   log: (logLevel: LogLevel, tags: string[], ...args: unknown[]) => void;
 }