SDA-4344 Electron upgrade (#1962)

* SDA-4344 Electron upgrade

* Typing update

package.json

@@ -1,7 +1,7 @@
 {
   "name": "symphony",
   "productName": "Symphony",
-  "version": "23.9.0",
+  "version": "23.9.1",
   "clientVersion": "2.0.1",
   "buildNumber": "0",
   "searchAPIVersion": "1.55.3",
@@ -178,7 +178,7 @@
     "builder-util-runtime": "^9.0.3",
     "cross-env": "7.0.3",
     "del": "3.0.0",
-    "electron": "25.3.1",
+    "electron": "25.8.4",
     "electron-builder": "^24.2.1",
     "electron-icon-maker": "0.0.5",
     "electron-osx-sign": "^0.6.0",

src/app/activity-detection.ts

@@ -1,14 +1,14 @@
 import { app, powerMonitor, WebContents } from 'electron';
-import Timer = NodeJS.Timer;
+import Timeout = NodeJS.Timeout;
 
 import { logger } from '../common/logger';
 import { windowHandler } from './window-handler';
 
 class ActivityDetection {
   private idleThreshold: number;
   private window: WebContents | null;
-  private timer: Timer | undefined;
-  private queryInterval: NodeJS.Timer | undefined;
+  private timer: Timeout | undefined;
+  private queryInterval: Timeout | undefined;
 
   constructor() {
     this.idleThreshold = 60 * 60 * 1000;

src/common/utils.ts

@@ -1,6 +1,7 @@
 // regex match the semver (semantic version) this checks for the pattern X.Y.Z
 // ex-valid  v1.2.0, 1.2.0, 2.3.4-r51
-const semver = /^v?(?:\d+)(\.(?:[x*]|\d+)(\.(?:[x*]|\d+)(?:-[\da-z-]+(?:\.[\da-z-]+)*)?(?:\+[\da-z-]+(?:\.[\da-z-]+)*)?)?)?$/i;
+const semver =
+  /^v?(?:\d+)(\.(?:[x*]|\d+)(\.(?:[x*]|\d+)(?:-[\da-z-]+(?:\.[\da-z-]+)*)?(?:\+[\da-z-]+(?:\.[\da-z-]+)*)?)?)?$/i;
 const patch = /-([0-9A-Za-z-.]+)/;
 
 /**
@@ -205,15 +206,17 @@ export const throttle = (
     );
   }
 
-  let timer: NodeJS.Timer;
+  let timer: NodeJS.Timeout;
   let lastRan = 0;
 
   return (...args) => {
     if (!lastRan) {
       func.apply(null, args);
       lastRan = Date.now();
     } else {
-      clearTimeout(timer);
+      if (timer) {
+        clearTimeout(timer);
+      }
       timer = setTimeout(() => {
         if (Date.now() - lastRan >= wait) {
           func.apply(null, args);

src/renderer/notification.ts

@@ -31,7 +31,7 @@ const CONTAINER_WIDTH = 363;
 interface ICustomBrowserWindow extends Electron.BrowserWindow {
   winName: string;
   notificationData: INotificationData;
-  displayTimer: NodeJS.Timer;
+  displayTimer: NodeJS.Timeout;
   clientId: number;
 }
 
@@ -75,7 +75,7 @@ class Notification extends NotificationHandler {
   };
   private activeNotifications: ICustomBrowserWindow[] = [];
   private inactiveWindows: ICustomBrowserWindow[] = [];
-  private cleanUpTimer: NodeJS.Timer;
+  private cleanUpTimer: NodeJS.Timeout;
   private notificationQueue: INotificationData[] = [];
 
   private readonly notificationCallbacks: any[] = [];