Refactor app updates.

Author: mikecao

package.json

@@ -92,6 +92,7 @@
     "immutable": "^4.0.0-rc.12",
     "lodash": "^4.17.15",
     "mime": "^2.4.5",
+    "node-machine-id": "^1.1.12",
     "prop-types": "^15.7.1",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
@@ -101,6 +102,7 @@
     "react-window": "^1.8.5",
     "redux": "^4.0.5",
     "redux-thunk": "^2.3.0",
+    "semver": "^7.3.2",
     "three": "^0.116.1",
     "tinycolor2": "^1.4.1"
   },

src/actions/app.js

@@ -1,9 +1,10 @@
 import { createSlice } from '@reduxjs/toolkit';
-import { api, events, updater, renderer, stage, logger } from 'view/global';
-import menuConfig from 'view/config/menu';
+import { api, renderer, stage, logger } from 'view/global';
 import { loadConfig } from 'actions/config';
 import { newProject } from 'actions/project';
+import { checkForUpdates, updateDownloadProgress } from 'actions/updates';
 import { raiseError } from 'actions/errors';
+import { showModal } from './modals';
 
 const initialState = {
   statusText: '',
@@ -58,10 +59,20 @@ export function initApp() {
     await dispatch(loadConfig());
     await dispatch(newProject());
 
-    const { checkForUpdates } = getState().config;
+    const { config } = getState();
 
-    if (checkForUpdates) {
-      updater.checkForUpdates();
+    api.on('download-progress', info => {
+      dispatch(updateDownloadProgress(info));
+    });
+
+    if (config.checkForUpdates) {
+      await dispatch(checkForUpdates());
+
+      const { hasUpdate } = getState().updates;
+
+      if (hasUpdate) {
+        dispatch(showModal('AppUpdates', { title: 'Updates' }));
+      }
     }
   };
 }

src/actions/updates.js

@@ -0,0 +1,75 @@
+import { createSlice } from '@reduxjs/toolkit';
+import semver from 'semver';
+import { api, env, logger } from 'view/global';
+
+const initialState = {
+  status: null,
+  checked: false,
+  hasUpdate: false,
+  downloadComplete: false,
+  downloadProgress: 0,
+  lastCheck: 0,
+  updateInfo: null,
+};
+
+const appUpdateStore = createSlice({
+  name: 'updates',
+  initialState,
+  reducers: {
+    updateState(state, action) {
+      return { ...state, ...action.payload };
+    },
+  },
+});
+
+const { updateState } = appUpdateStore.actions;
+
+export default appUpdateStore.reducer;
+
+export function updateDownloadProgress(info) {
+  return dispatch => {
+    dispatch(updateState({ downloadProgress: info.percent }));
+  };
+}
+
+export function downloadUpdate() {
+  return async dispatch => {
+    await dispatch(updateState({ status: 'downloading' }));
+
+    const result = await api.invoke('download-update');
+
+    logger.log('Update downloaded:', result);
+
+    await dispatch(updateState({ downloadComplete: true, status: null }));
+  };
+}
+
+export function quitAndInstall() {
+  return async (dispatch, getState) => {
+    const { downloadComplete } = getState().updates;
+
+    if (downloadComplete) {
+      await api.invoke('quit-and-install');
+    }
+  };
+}
+
+export function checkForUpdates() {
+  return async (dispatch, getState) => {
+    await dispatch(updateState({ status: 'checking', lastCheck: Date.now() }));
+
+    const { updateInfo } = await api.invoke('check-for-updates');
+
+    const hasUpdate = semver.gt(updateInfo.version, env.APP_VERSION);
+    const { config } = getState();
+    const status = config.autoUpdate && hasUpdate ? 'downloading' : null;
+
+    logger.log('Update check complete:', updateInfo);
+
+    await dispatch(updateState({ checked: true, status, updateInfo, hasUpdate }));
+
+    if (config.autoUpdate && hasUpdate) {
+      dispatch(downloadUpdate());
+    }
+  };
+}

src/core/AppUpdater.js

@@ -4,8 +4,6 @@ export { send, on, once, off, invoke } from 'main/api/ipc';
 export { spawnProcess } from 'main/api/process';
 export { getEnvironment } from 'main/api/remote';
 export {
-  getCurrentWindow,
-  getDialog,
   maximizeWindow,
   minimizeWindow,
   unmaximizeWindow,

src/main/api/index.js

@@ -3,14 +3,6 @@ import { remote } from 'electron';
 const win = remote.getCurrentWindow();
 const { dialog } = remote;
 
-export function getCurrentWindow() {
-  return win;
-}
-
-export function getDialog() {
-  return dialog;
-}
-
 export function maximizeWindow() {
   if (win.isMaximized()) {
     win.unmaximize();

src/main/api/window.js

@@ -13,7 +13,7 @@ export default function init() {
   autoUpdater.on('error', error => {
     log('update-error');
 
-    sendMessage('update-error', error.stack || error.message || error);
+    sendMessage('update-error', error);
   });
 
   autoUpdater.on('checking-for-update', () => {

src/main/autoupdate.js

@@ -1,5 +1,6 @@
 import path from 'path';
 import { app } from 'electron';
+import { machineIdSync } from 'node-machine-id';
 import os from 'os';
 
 const version = app.getVersion();
@@ -20,3 +21,4 @@ export const APP_CONFIG_FILE = path.join(
 );
 export const LICENSE_FILE = path.join(USER_DATA_PATH, 'license.dat');
 export const ELECTRON_VERSION = process.versions.electron;
+export const MACHINE_ID = machineIdSync();

src/main/environment.js

@@ -8,6 +8,7 @@ import project from 'actions/project';
 import reactors from 'actions/reactors';
 import scenes from 'actions/scenes';
 import stage from 'actions/stage';
+import updates from 'actions/updates';
 import video from 'actions/video';
 
 export default combineReducers({
@@ -20,5 +21,6 @@ export default combineReducers({
   reactors,
   scenes,
   stage,
+  updates,
   video,
 });

src/reducers/index.js

@@ -0,0 +1,4 @@
+export Button from 'components/interface/Button';
+export Checkmark from 'components/interface/Checkmark';
+export Icon from 'components/interface/Icon';
+export Spinner from 'components/interface/Spinner';