ELECTRON-1327 - Bump Electron version to 5.x (#754)

package.json

@@ -85,16 +85,16 @@
   },
   "devDependencies": {
     "@types/enzyme": "3.9.0",
-    "@types/ffi": "0.2.2",
+    "@types/ffi-napi": "2.4.1",
+    "@types/ref-napi": "1.4.0",
     "@types/jest": "23.3.12",
     "@types/node": "10.11.4",
     "@types/react": "16.8.3",
     "@types/react-dom": "16.0.9",
-    "@types/ref": "0.0.28",
     "browserify": "16.2.3",
     "cross-env": "5.2.0",
     "del": "3.0.0",
-    "electron": "3.1.12",
+    "electron": "5.0.8",
     "electron-builder": "20.38.4",
     "electron-builder-squirrel-windows": "20.38.3",
     "electron-rebuild": "1.8.2",
@@ -121,16 +121,16 @@
     "electron-fetch": "1.3.0",
     "electron-log": "2.2.17",
     "electron-spellchecker": "git+https://github.com/symphonyoss/electron-spellchecker.git#v2.0.1",
-    "ffi": "git+https://github.com/symphonyoss/node-ffi.git#v1.2.8",
+    "ffi-napi": "2.4.5",
     "filesize": "3.6.1",
     "lodash.isequal": "4.5.0",
     "react": "16.6.3",
     "react-dom": "16.6.0",
-    "ref": "1.3.5",
+    "ref-napi": "1.4.1",
     "shell-path": "2.1.0"
   },
   "optionalDependencies": {
     "screen-snippet": "git+https://github.com/symphonyoss/ScreenSnippet.git#v1.0.7",
-    "swift-search": "1.55.3-2"
+    "swift-search": "1.55.2-beta.1"
   }
 }

src/app/crypto-handler.ts

@@ -1,7 +1,7 @@
 import { app } from 'electron';
-import { Library } from 'ffi';
+import { Library } from 'ffi-napi';
 import * as path from 'path';
-import { refType, types } from 'ref';
+import { refType, types } from 'ref-napi';
 
 const execPath = path.dirname(app.getPath('exe'));
 import { isDevEnv, isMac } from '../common/env';

src/app/memory-monitor.ts

@@ -18,7 +18,7 @@ class MemoryMonitor {
         this.isInMeeting = false;
         this.canReload = true;
         this.maxIdleTime = 4 * 60 * 60 * 1000; // 4 hours
-        this.memoryThreshold = 800; // 800MB
+        this.memoryThreshold = 800 * 1024; // 800MB
         this.memoryRefreshThreshold = 60 * 60 * 1000; // 1 hour
     }
 
@@ -57,16 +57,15 @@ class MemoryMonitor {
 
         (electron.powerMonitor as any).querySystemIdleTime((time) => {
             const idleTime = time * 1000;
-            const workingSetSizeInMB = this.memoryInfo && (this.memoryInfo.workingSetSize / 1024) || 0;
             if (!(!this.isInMeeting
                 && windowHandler.isOnline
                 && this.canReload
                 && idleTime > this.maxIdleTime
-                && (workingSetSizeInMB > this.memoryThreshold))
+                && (this.memoryInfo && this.memoryInfo.private > this.memoryThreshold))
             ) {
                 logger.info(`memory-monitor: Not Reloading the app as
                 application was refreshed less than a hour ago? ${this.canReload ? 'no' : 'yes'}
-                memory consumption is ${(workingSetSizeInMB) || 'unknown'}mb is less than? ${this.memoryThreshold}mb
+                memory consumption is ${(this.memoryInfo && this.memoryInfo.private) || 'unknown'}kb is less than? ${this.memoryThreshold}kb
                 system idle tick was ${idleTime}ms is less than? ${this.maxIdleTime}ms
                 user was in a meeting? ${this.isInMeeting}
                 is network online? ${windowHandler.isOnline}`);
@@ -75,7 +74,7 @@ class MemoryMonitor {
             const mainWindow = windowHandler.getMainWindow();
             if (mainWindow && windowExists(mainWindow)) {
                 logger.info(`memory-monitor: Reloading the app to optimize memory usage as
-                    memory consumption is ${workingSetSizeInMB}mb is greater than? ${this.memoryThreshold}mb threshold
+                    memory consumption is ${this.memoryInfo.private}kb is greater than? ${this.memoryThreshold}kb threshold
                     system idle tick was ${idleTime}ms is greater than ${this.maxIdleTime}ms
                     user was in a meeting? ${this.isInMeeting}
                     is network online? ${windowHandler.isOnline}`);

src/renderer/preload-main.ts

@@ -55,12 +55,15 @@ ipcRenderer.on('page-load', (_event, { locale, resources, enableCustomTitleBar,
         ReactDOM.render(element, div);
     }
 
-    webFrame.setSpellCheckProvider('en-US', false,{
-        spellCheck(text) {
-            return !ipcRenderer.sendSync(apiName.symphonyApi, {
-                cmd: apiCmds.isMisspelled,
-                word: text,
+    webFrame.setSpellCheckProvider('en-US', {
+        spellCheck(words, callback) {
+            const misspelled = words.filter((word) => {
+                return ipcRenderer.sendSync(apiName.symphonyApi, {
+                    cmd: apiCmds.isMisspelled,
+                    word,
+                });
             });
+            callback(misspelled);
         },
     });