From 18feb238a7eafef6b236c4da73da903585de69f8 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Fri, 4 May 2018 14:16:28 -0400 Subject: [PATCH] move updater to jslib --- jslib | 2 +- src/main.ts | 11 ++- src/main/updater.main.ts | 144 --------------------------------------- 3 files changed, 10 insertions(+), 147 deletions(-) delete mode 100644 src/main/updater.main.ts diff --git a/jslib b/jslib index c3dad8fd1a..2032e14285 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit c3dad8fd1ae862476ccc417b4d33eecd3edd61a9 +Subproject commit 2032e14285ac3d4b2f3e9e310ad19ca1dd40c525 diff --git a/src/main.ts b/src/main.ts index ecaa7f08c9..dd21170ce1 100644 --- a/src/main.ts +++ b/src/main.ts @@ -7,7 +7,6 @@ import { MenuMain } from './main/menu.main'; import { MessagingMain } from './main/messaging.main'; import { PowerMonitorMain } from './main/powerMonitor.main'; import { TrayMain } from './main/tray.main'; -import { UpdaterMain } from './main/updater.main'; import { ConstantsService } from 'jslib/services/constants.service'; @@ -15,7 +14,9 @@ import { KeytarStorageListener } from 'jslib/electron/keytarStorageListener'; import { ElectronLogService } from 'jslib/electron/services/electronLog.service'; import { ElectronMainMessagingService } from 'jslib/electron/services/electronMainMessaging.service'; import { ElectronStorageService } from 'jslib/electron/services/electronStorage.service'; +import { UpdaterMain } from 'jslib/electron/updater.main'; import { WindowMain } from 'jslib/electron/window.main'; + import { DesktopConstants } from './desktopConstants'; export class Main { @@ -66,7 +67,13 @@ export class Main { this.windowMain = new WindowMain(this.storageService); this.messagingMain = new MessagingMain(this); - this.updaterMain = new UpdaterMain(this); + this.updaterMain = new UpdaterMain(this.i18nService, this.windowMain, 'desktop', () => { + this.menuMain.updateMenuItem.enabled = false; + }, () => { + this.menuMain.updateMenuItem.enabled = true; + }, () => { + this.menuMain.updateMenuItem.label = this.i18nService.t('restartToUpdate'); + }); this.menuMain = new MenuMain(this); this.powerMonitorMain = new PowerMonitorMain(this); this.trayMain = new TrayMain(this.windowMain, 'Bitwarden', async () => { diff --git a/src/main/updater.main.ts b/src/main/updater.main.ts deleted file mode 100644 index ea0dee5b1d..0000000000 --- a/src/main/updater.main.ts +++ /dev/null @@ -1,144 +0,0 @@ -import { - dialog, - Menu, - MenuItem, - shell, -} from 'electron'; -import log from 'electron-log'; -import { autoUpdater } from 'electron-updater'; - -import { Main } from '../main'; - -import { - isAppImage, - isDev, - isMacAppStore, - isWindowsPortable, - isWindowsStore, -} from 'jslib/electron/utils'; - -const UpdaterCheckInitalDelay = 5 * 1000; // 5 seconds -const UpdaterCheckInterval = 12 * 60 * 60 * 1000; // 12 hours - -export class UpdaterMain { - private doingUpdateCheck = false; - private doingUpdateCheckWithFeedback = false; - private canUpdate = false; - - constructor(private main: Main) { - autoUpdater.logger = log; - - const linuxCanUpdate = process.platform === 'linux' && isAppImage(); - const windowsCanUpdate = process.platform === 'win32' && !isWindowsStore() && !isWindowsPortable(); - const macCanUpdate = process.platform === 'darwin' && !isMacAppStore(); - this.canUpdate = linuxCanUpdate || windowsCanUpdate || macCanUpdate; - } - - async init() { - global.setTimeout(async () => await this.checkForUpdate(), UpdaterCheckInitalDelay); - global.setInterval(async () => await this.checkForUpdate(), UpdaterCheckInterval); - - autoUpdater.on('checking-for-update', () => { - this.main.menuMain.updateMenuItem.enabled = false; - this.doingUpdateCheck = true; - }); - - autoUpdater.on('update-available', () => { - if (this.doingUpdateCheckWithFeedback) { - if (this.main.windowMain.win == null) { - this.reset(); - return; - } - - const result = dialog.showMessageBox(this.main.windowMain.win, { - type: 'info', - title: this.main.i18nService.t('updateAvailable'), - message: this.main.i18nService.t('updateAvailable'), - detail: this.main.i18nService.t('updateAvailableDesc'), - buttons: [this.main.i18nService.t('yes'), this.main.i18nService.t('no')], - cancelId: 1, - defaultId: 0, - noLink: true, - }); - - if (result === 0) { - autoUpdater.downloadUpdate(); - } else { - this.reset(); - } - } - }); - - autoUpdater.on('update-not-available', () => { - if (this.doingUpdateCheckWithFeedback && this.main.windowMain.win != null) { - dialog.showMessageBox(this.main.windowMain.win, { - message: this.main.i18nService.t('noUpdatesAvailable'), - buttons: [this.main.i18nService.t('ok')], - defaultId: 0, - noLink: true, - }); - } - - this.reset(); - }); - - autoUpdater.on('update-downloaded', (info) => { - this.main.menuMain.updateMenuItem.label = this.main.i18nService.t('restartToUpdate'); - - if (this.main.windowMain.win == null) { - return; - } - - const result = dialog.showMessageBox(this.main.windowMain.win, { - type: 'info', - title: this.main.i18nService.t('restartToUpdate'), - message: this.main.i18nService.t('restartToUpdate'), - detail: this.main.i18nService.t('restartToUpdateDesc', info.version), - buttons: [this.main.i18nService.t('restart'), this.main.i18nService.t('later')], - cancelId: 1, - defaultId: 0, - noLink: true, - }); - - if (result === 0) { - autoUpdater.quitAndInstall(false, true); - } - }); - - autoUpdater.on('error', (error) => { - if (this.doingUpdateCheckWithFeedback) { - dialog.showErrorBox(this.main.i18nService.t('updateError'), - error == null ? this.main.i18nService.t('unknown') : (error.stack || error).toString()); - } - - this.reset(); - }); - } - - async checkForUpdate(withFeedback: boolean = false) { - if (this.doingUpdateCheck || isDev()) { - return; - } - - if (!this.canUpdate) { - if (withFeedback) { - shell.openExternal('https://github.com/bitwarden/desktop/releases'); - } - - return; - } - - this.doingUpdateCheckWithFeedback = withFeedback; - if (withFeedback) { - autoUpdater.autoDownload = false; - } - - await autoUpdater.checkForUpdates(); - } - - private reset() { - autoUpdater.autoDownload = true; - this.main.menuMain.updateMenuItem.enabled = true; - this.doingUpdateCheck = false; - } -}