From af65830825f285ea0301ad37b3483da5735c256f Mon Sep 17 00:00:00 2001 From: Rafael Araujo Lehmkuhl Date: Fri, 22 Nov 2024 13:26:42 -0300 Subject: [PATCH] electron: Offer automatic app update With this new implementation, the user is informed that a new version of the application is available and can choose between downloading it or not. --- electron/main.ts | 24 +++- electron/preload.ts | 12 ++ electron/services/auto-update.ts | 51 ++++++++ src/App.vue | 2 + src/components/UpdateNotification.vue | 181 ++++++++++++++++++++++++++ src/libs/cosmos.ts | 32 +++++ 6 files changed, 296 insertions(+), 6 deletions(-) create mode 100644 electron/services/auto-update.ts create mode 100644 src/components/UpdateNotification.vue diff --git a/electron/main.ts b/electron/main.ts index b9dd15441..bf0685c89 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -1,9 +1,16 @@ import { app, BrowserWindow, protocol, screen } from 'electron' +import logger from 'electron-log' import { join } from 'path' +import { setupAutoUpdater } from './services/auto-update' import store from './services/config-store' import { setupNetworkService } from './services/network' +// If the app is packaged, push logs to the system instead of the console +if (app.isPackaged) { + Object.assign(console, logger.functions) +} + export const ROOT_PATH = { dist: join(__dirname, '..'), } @@ -33,11 +40,6 @@ function createWindow(): void { store.set('windowBounds', { x, y, width, height }) }) - // Test active push message to Renderer-process. - mainWindow.webContents.on('did-finish-load', () => { - mainWindow?.webContents.send('main-process-message', new Date().toLocaleString()) - }) - if (process.env.VITE_DEV_SERVER_URL) { mainWindow.loadURL(process.env.VITE_DEV_SERVER_URL) } else { @@ -71,7 +73,17 @@ protocol.registerSchemesAsPrivileged([ setupNetworkService() -app.whenReady().then(createWindow) +app.whenReady().then(async () => { + console.log('Electron app is ready.') + console.log(`Cockpit version: ${app.getVersion()}`) + + console.log('Creating window...') + createWindow() + + setTimeout(() => { + setupAutoUpdater(mainWindow as BrowserWindow) + }, 5000) +}) app.on('before-quit', () => { // @ts-ignore: import.meta.env does not exist in the types diff --git a/electron/preload.ts b/electron/preload.ts index 4312004c1..08977a09b 100644 --- a/electron/preload.ts +++ b/electron/preload.ts @@ -2,4 +2,16 @@ import { contextBridge, ipcRenderer } from 'electron' contextBridge.exposeInMainWorld('electronAPI', { getInfoOnSubnets: () => ipcRenderer.invoke('get-info-on-subnets'), + onUpdateAvailable: (callback: (info: any) => void) => + ipcRenderer.on('update-available', (_event, info) => callback(info)), + onUpdateDownloaded: (callback: (info: any) => void) => + ipcRenderer.on('update-downloaded', (_event, info) => callback(info)), + onCheckingForUpdate: (callback: () => void) => ipcRenderer.on('checking-for-update', () => callback()), + onUpdateNotAvailable: (callback: (info: any) => void) => + ipcRenderer.on('update-not-available', (_event, info) => callback(info)), + onDownloadProgress: (callback: (info: any) => void) => + ipcRenderer.on('download-progress', (_event, info) => callback(info)), + downloadUpdate: () => ipcRenderer.send('download-update'), + installUpdate: () => ipcRenderer.send('install-update'), + cancelUpdate: () => ipcRenderer.send('cancel-update'), }) diff --git a/electron/services/auto-update.ts b/electron/services/auto-update.ts new file mode 100644 index 000000000..077d4bf64 --- /dev/null +++ b/electron/services/auto-update.ts @@ -0,0 +1,51 @@ +import { BrowserWindow, ipcMain } from 'electron' +import electronUpdater, { type AppUpdater } from 'electron-updater' + +/** + * Setup auto updater + * @param {BrowserWindow} mainWindow - The main Electron window + */ +export const setupAutoUpdater = (mainWindow: BrowserWindow): void => { + const autoUpdater: AppUpdater = electronUpdater.autoUpdater + autoUpdater.logger = console + autoUpdater.autoDownload = false // Prevent automatic downloads + + autoUpdater + .checkForUpdates() + .then((e) => console.info(e)) + .catch((e) => console.error(e)) + + autoUpdater.on('checking-for-update', () => { + mainWindow.webContents.send('checking-for-update') + }) + + autoUpdater.on('update-available', (info) => { + mainWindow.webContents.send('update-available', info) + }) + + autoUpdater.on('update-not-available', (info) => { + mainWindow.webContents.send('update-not-available', info) + }) + + autoUpdater.on('download-progress', (progressInfo) => { + mainWindow.webContents.send('download-progress', progressInfo) + }) + + autoUpdater.on('update-downloaded', (info) => { + mainWindow.webContents.send('update-downloaded', info) + }) + + // Add handlers for update control + ipcMain.on('download-update', () => { + autoUpdater.downloadUpdate() + }) + + ipcMain.on('install-update', () => { + autoUpdater.quitAndInstall() + }) + + ipcMain.on('cancel-update', () => { + autoUpdater.removeAllListeners('update-downloaded') + autoUpdater.removeAllListeners('download-progress') + }) +} diff --git a/src/App.vue b/src/App.vue index 94af043d2..f50106e6c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -316,6 +316,7 @@ + diff --git a/src/libs/cosmos.ts b/src/libs/cosmos.ts index 2d961d4a1..810bef604 100644 --- a/src/libs/cosmos.ts +++ b/src/libs/cosmos.ts @@ -191,6 +191,38 @@ declare global { * @returns Promise containing subnet information */ getInfoOnSubnets: () => Promise + /** + * Register callback for update available event + */ + onUpdateAvailable: (callback: (info: any) => void) => void + /** + * Register callback for update downloaded event + */ + onUpdateDownloaded: (callback: (info: any) => void) => void + /** + * Trigger update download + */ + downloadUpdate: () => void + /** + * Trigger update installation + */ + installUpdate: () => void + /** + * Cancel ongoing update + */ + cancelUpdate: () => void + /** + * Register callback for checking for update event + */ + onCheckingForUpdate: (callback: () => void) => void + /** + * Register callback for update not available event + */ + onUpdateNotAvailable: (callback: (info: any) => void) => void + /** + * Register callback for download progress event + */ + onDownloadProgress: (callback: (info: any) => void) => void } } }