fix: install update on exit

Author: siandreev

apps/desktop/src/electron/autoUpdate.ts

@@ -1,8 +1,11 @@
 import { autoUpdater, BrowserWindow } from 'electron';
 import log from 'electron-log/main';
 import packageJson from '../../package.json';
+import { mainStorage } from './storageService';
 
 export class AutoUpdateManager {
+    public static versionDownloadedKey = 'versionDownloaded';
+
     private readonly channel = 'stable';
 
     private newAvailableVersion: string | undefined = undefined;
@@ -12,19 +15,37 @@ export class AutoUpdateManager {
     // private feedBaseUrl = 'https://update.electronjs.org';
     private feedBaseUrl = 'https://tonkeeper-web-updater-test.nkuznetsov.workers.dev';
 
+    public static async quitAndInstallIfFlagged() {
+        const flagged = await mainStorage.get(AutoUpdateManager.versionDownloadedKey);
+        if (flagged) {
+            return AutoUpdateManager.quitAndInstall();
+        }
+    }
+
+    public static async quitAndInstall() {
+        await mainStorage.delete(AutoUpdateManager.versionDownloadedKey);
+        setImmediate(() => autoUpdater.quitAndInstall());
+        return true;
+    }
+
     constructor(win: BrowserWindow) {
         this.win = win;
 
         this.init();
     }
 
-    private init() {
+    private async init() {
         const feedURL = `${this.feedBaseUrl}/${this.getRepoUrl()}/${process.platform}/${
             packageJson.version
         }/${this.channel}`;
         autoUpdater.setFeedURL({ url: feedURL });
         this.listenDownload();
 
+        const exited = await AutoUpdateManager.quitAndInstallIfFlagged();
+        if (exited) {
+            return;
+        }
+
         autoUpdater.checkForUpdates();
         setInterval(() => {
             autoUpdater.checkForUpdates();
@@ -39,10 +60,6 @@ export class AutoUpdateManager {
             .trim();
     }
 
-    public quitAndInstall() {
-        setImmediate(() => autoUpdater.quitAndInstall());
-    }
-
     public getNewVersionAvailable() {
         return this.newAvailableVersion;
     }
@@ -52,6 +69,7 @@ export class AutoUpdateManager {
             const version = process.platform === 'win32' ? releaseNotes : releaseName;
             this.newAvailableVersion = version;
             this.win.webContents.send('app-update::ready', { version });
+            mainStorage.set(AutoUpdateManager.versionDownloadedKey, version);
             log.log('[AutoUpdate] updater new version fetched:', version);
         });
 

apps/desktop/src/index.ts

@@ -8,6 +8,7 @@ import {
     setProtocolHandlerWindowsLinux
 } from './electron/protocol';
 import { tonConnectSSE } from './electron/sseEvetns';
+import { AutoUpdateManager } from './electron/autoUpdate';
 
 app.setName('Tonkeeper Pro');
 
@@ -42,14 +43,27 @@ if (process.platform !== 'linux') {
 }
 
 app.on('before-quit', async e => {
-    e.preventDefault();
-    tonConnectSSE.destroy();
-    if (process.platform !== 'linux') {
-        powerMonitor.off('unlock-screen', onUnLock);
+    try {
+        e.preventDefault();
+        tonConnectSSE.destroy();
+        if (process.platform !== 'linux') {
+            powerMonitor.off('unlock-screen', onUnLock);
+        }
+    } catch (e) {
+        console.error(e);
     }
 
     await delay(100);
-    app.exit();
+
+    try {
+        const exited = AutoUpdateManager.quitAndInstallIfFlagged();
+        if (!exited) {
+            app.exit();
+        }
+    } catch (e) {
+        console.error(e);
+        app.exit();
+    }
 });
 
 setDefaultProtocolClient();