Merge pull request #43 from h15200/updater

Updater

Author: StephWood

main.js

@@ -55,9 +55,9 @@ require("./main_httpController.js")();
 require("./main_grpcController.js")();
 
 // configure logging
-// autoUpdater.logger = log;
-// autoUpdater.logger.transports.file.level = "info";
-// log.info("App starting...");
+autoUpdater.logger = log;
+autoUpdater.logger.transports.file.level = "info";
+log.info("App starting...");
 
 let mainWindow;
 
@@ -170,26 +170,6 @@ isDev
 ================================
   `);
 
-// let isDev = false;
-// console.log("process.defaultApp ->", process.defaultApp);
-// console.log("process.execPath -> ", process.execPath);
-
-// if (
-//   process.defaultApp ||
-//   /[\\/]electron-prebuilt[\\/]/.test(process.execPath) ||
-//   /[\\/]electron[\\/]/.test(process.execPath)
-// ) {
-//   isDev = true;
-// }
-// console.log(
-//   "current regex test -> ",
-//   /[\\/]electron-prebuilt[\\/]/.test(process.execPath)
-// );
-// if (isDev) console.log("isDev is TRUE");
-// if (isDev === false) console.log("isDev is FALSE");
-// Temporary fix broken high-dpi scale factor on Windows (125% scaling)
-// info: https://github.com/electron/electron/issues/9691
-
 if (process.platform === "win32") {
   // if user is on windows...
   app.commandLine.appendSwitch("high-dpi-support", "true");
@@ -278,8 +258,6 @@ function createWindow() {
     // tldr: Remove the BrowserWindow instance that we created earlier by setting its value to null when we exit Swell
     mainWindow = null;
   });
-
-  // moved require mainmenu to top
 }
 
 /********* end of createWindow declaration ******/
@@ -327,38 +305,38 @@ const sendStatusToWindow = (text) => {
   }
 };
 
-// ipcMain.on("check-for-update", () => {
-//   //listens to ipcRenderer in UpdatePopUpContainer.jsx
-//   if (!isDev) autoUpdater.checkForUpdates();
-// });
-// autoUpdater.on('checking-for-update', () => {
-// sendStatusToWindow('Checking for update...');
-// // });
-// autoUpdater.on('update-available', info => {
-//   sendStatusToWindow('Update available.');
-// });
-// autoUpdater.on('update-not-available', info => {
-//   sendStatusToWindow('Update not available.');
-// });
-// autoUpdater.on("error", (err) => {
-//   console.error("autoUpdater error -> ", err);
-//   sendStatusToWindow(`Error in auto-updater`);
-// });
-// autoUpdater.on("download-progress", (progressObj) => {
-//   sendStatusToWindow(
-//     `Download speed: ${progressObj.bytesPerSecond} - Downloaded ${progressObj.percent}% (${progressObj.transferred} + '/' + ${progressObj.total} + )`
-//   );
-// });
-// autoUpdater.on("update-downloaded", (info) => {
-//   sendStatusToWindow("Update downloaded.");
-// });
-
-// autoUpdater.on('update-downloaded', info => {
-//   // Wait 5 seconds, then quit and install
-//   // In your application, you don't need to wait 500 ms.
-//   // You could call autoUpdater.quitAndInstall(); immediately
-//   autoUpdater.quitAndInstall();
-// });
+ipcMain.on("check-for-update", () => {
+  //listens to ipcRenderer in UpdatePopUpContainer.jsx
+  if (!isDev) autoUpdater.checkForUpdates();
+});
+autoUpdater.on("checking-for-update", () => {
+  sendStatusToWindow("Checking for update...");
+});
+autoUpdater.on("update-available", (info) => {
+  sendStatusToWindow("Update available.");
+});
+autoUpdater.on("update-not-available", (info) => {
+  sendStatusToWindow("Update not available.");
+});
+autoUpdater.on("error", (err) => {
+  console.error("autoUpdater error -> ", err);
+  sendStatusToWindow(`Error in auto-updater`);
+});
+autoUpdater.on("download-progress", (progressObj) => {
+  sendStatusToWindow(
+    `Download speed: ${progressObj.bytesPerSecond} - Downloaded ${progressObj.percent}% (${progressObj.transferred} + '/' + ${progressObj.total} + )`
+  );
+});
+autoUpdater.on("update-downloaded", (info) => {
+  sendStatusToWindow("Update downloaded.");
+});
+
+autoUpdater.on("update-downloaded", (info) => {
+  // Wait 5 seconds, then quit and install
+  // In your application, you don't need to wait 500 ms.
+  // You could call autoUpdater.quitAndInstall(); immediately
+  autoUpdater.quitAndInstall();
+});
 ipcMain.on("quit-and-install", () => {
   autoUpdater.quitAndInstall();
 });

preload.js

@@ -5,16 +5,18 @@ contextBridge.exposeInMainWorld("api", {
     // allowlist channels
     const allowedChannels = [
       "toMain",
+      "check-for-update",
       "confirm-clear-history",
+      "export-collection",
+      "fatalError",
+      "import-collection",
       "import-proto",
-      "quit-and-install",
-      "protoParserFunc-request",
       "open-http",
       "open-gql",
-      "import-collection",
-      "export-collection",
-      "open-http",
       "open-grpc",
+      "protoParserFunc-request",
+      "quit-and-install",
+      "uncaughtException",
     ];
     if (allowedChannels.includes(channel)) {
       ipcRenderer.send(channel, ...data);
@@ -27,11 +29,11 @@ contextBridge.exposeInMainWorld("api", {
       "fromMain",
       "add-collection",
       "clear-history-response",
-      "proto-info",
       "message",
+      "proto-info",
       "protoParserFunc-return",
-      "reqResUpdate",
       "reply-gql",
+      "reqResUpdate",
     ];
     if (allowedChannels.includes(channel)) {
       ipcRenderer.on(channel, (event, ...args) => cb(...args));

src/client/components/containers/App.jsx

@@ -20,7 +20,7 @@ class App extends Component {
   componentDidMount() {
     // This file will listen on all of these channels(selectAll, deselectAll, etc) for any communication from the main.js file(aka the main process)
     // ipcRenderer.send('check-for-update');
-    // api.send('check-for-update')
+    api.send("check-for-update");
     // ipcRenderer.on('selectAll', ReqResCtrl.selectAllReqRes); // if the selectAll touchbar button was clicked (then run this method called selectAllReqRes) that is located in the connectionController...likewise for the rest
     // ipcRenderer.on('deselectAll', ReqResCtrl.deselectAllReqRes);
     // ipcRenderer.on('openAllSelected', ReqResCtrl.openAllSelectedReqRes);

src/client/components/containers/UpdatePopUpContainer.jsx

@@ -1,6 +1,5 @@
 import React, { Component } from "react";
 import { connect } from "react-redux";
-// import { ipcRenderer } from 'electron';
 const { api } = window;
 
 const mapDispatchToProps = (dispatch) => ({});
@@ -30,7 +29,6 @@ class UpdatePopUpContainer extends Component {
 
   handleUpdateClick() {
     this.toggleShow();
-    // ipcRenderer.send('quit-and-install');
     api.send("quit-and-install");
   }