Merge pull request #34 from grimkor/v0.5.1

v0.5.1

electron/backend/index.ts

@@ -182,6 +182,11 @@ class Backend {
     });
   }
 
+  stop() {
+    this.stopLogParser();
+    ipcMain.removeAllListeners();
+  }
+
   route(action: string, message: string) {
     this.subscriptions.forEach((sub) => sub.event.reply(action, message));
   }

electron/log_parser/LogParser.ts

@@ -69,6 +69,10 @@ class LogParser {
     this.tail.watch();
   }
 
+  stop() {
+    this.tail.unwatch();
+  }
+
   setDefaultState() {
     this.player = {
       ...this.player,

electron/log_parser/index.ts

@@ -11,6 +11,12 @@ try {
     // @ts-ignore
     const Parser = new LogParser(file, process);
     Parser.run();
+    process.addListener("disconnect", () => {
+      Parser.stop();
+    });
+    process.addListener("beforeExit", () => {
+      Parser.stop();
+    });
   }
 } catch (e) {
   logger.writeError("LogParser init", e);

electron/logger/index.ts

@@ -1,7 +1,7 @@
 import path from "path";
-import {homedir} from "os";
+import { homedir } from "os";
 import fs from "fs";
-import {DatabaseCallback} from "../types";
+import { DatabaseCallback } from "../types";
 
 export default class Logger {
   outputFile: string;
@@ -38,7 +38,11 @@ export default class Logger {
         this.writeError(name, err?.name, err?.message);
       } else {
         if (callback) {
-          callback(result);
+          try {
+            callback(result);
+          } catch (e) {
+            this.writeError("withErrorHandling", name, e);
+          }
         }
       }
     };

electron/main.ts

@@ -1,10 +1,16 @@
-import {app, BrowserWindow, Menu, MenuItemConstructorOptions, shell,} from "electron";
+import {
+  app,
+  BrowserWindow,
+  Menu,
+  MenuItemConstructorOptions,
+  shell,
+} from "electron";
 import path from "path";
 import url from "url";
 import Backend from "./backend";
 import electronIsDev from "electron-is-dev";
 import Logger from "./logger";
-import {getDatabase} from "./database";
+import { getDatabase } from "./database";
 import {
   createCharacterTable,
   createConfigTable,
@@ -14,11 +20,13 @@ import {
   createPlayerTable,
 } from "./database/defaults";
 import upgrade from "./database/upgrade";
-import {version} from "../package.json";
+import { version } from "../package.json";
 
 const isMac = process.platform === "darwin";
 let mainWindow: BrowserWindow | null;
 
+const backend = new Backend();
+
 function createWindow() {
   mainWindow = new BrowserWindow({
     width: 1024,
@@ -46,6 +54,7 @@ function createWindow() {
 app.on("ready", createWindow);
 app.on("window-all-closed", () => {
   if (process.platform !== "darwin") {
+    backend.stop();
     app.quit();
   }
 });
@@ -59,7 +68,7 @@ app.on("activate", () => {
 const menu = Menu.buildFromTemplate([
   {
     label: "File",
-    submenu: [isMac ? {role: "close"} : {role: "quit"}],
+    submenu: [isMac ? { role: "close" } : { role: "quit" }],
   },
   {
     label: "About",
@@ -104,16 +113,16 @@ const menu = Menu.buildFromTemplate([
 
   ...((electronIsDev
     ? [
-      {
-        label: "Dev",
-        submenu: [
-          {label: "Refresh", role: "reload"},
-          {
-            role: "toggleDevTools",
-          },
-        ],
-      },
-    ]
+        {
+          label: "Dev",
+          submenu: [
+            { label: "Refresh", role: "reload" },
+            {
+              role: "toggleDevTools",
+            },
+          ],
+        },
+      ]
     : []) as MenuItemConstructorOptions[]),
 ]);
 Menu.setApplicationMenu(menu);
@@ -141,7 +150,6 @@ try {
         }
       });
     });
-    const backend = new Backend();
     backend.run();
   });
 } catch (e) {

package.json

@@ -5,7 +5,7 @@
     "url": "https://github.com/grimkor/fs-stat-tracker"
   },
   "license": "MIT",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "private": true,
   "dependencies": {
     "electron-is-dev": "^1.2.0",