-
Notifications
You must be signed in to change notification settings - Fork 430
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor(updateChecker):optimize automatic updates and add a progress…
… bar
- Loading branch information
Showing
12 changed files
with
565 additions
and
100 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| export default { | ||
| updateTitle: { | ||
| zh: '新版本更新', | ||
| en: 'New Version Update', | ||
| ja: '新しいバージョンの更新', | ||
| tr: 'Yeni Sürüm Güncellemesi', | ||
| hu: 'Új verzió frissítés', | ||
| }, | ||
| ignoreVersion: { | ||
| zh: '忽略此版本', | ||
| en: 'Ignore this version', | ||
| ja: 'このバージョンを無視する', | ||
| tr: 'Bu sürümü yoksay', | ||
| hu: 'Figyelmen kívül hagyás', | ||
| }, | ||
| nextRemind: { | ||
| zh: '以后提醒', | ||
| en: 'Remind me later', | ||
| ja: '後でリマインドする', | ||
| tr: 'Daha sonra hatırlat', | ||
| hu: 'Később emlékeztessen', | ||
| }, | ||
| update: { | ||
| zh: '更新', | ||
| en: 'Update', | ||
| ja: '更新', | ||
| tr: 'Güncelle', | ||
| hu: 'Frissítés', | ||
| }, | ||
| downloadProgress: { | ||
| zh: '下载进度', | ||
| en: 'Download Progress', | ||
| ja: 'ダウンロード進行状況', | ||
| tr: 'İndirme İlerlemesi', | ||
| hu: 'Letöltési Előrehaladás', | ||
| }, | ||
| downloading: { | ||
| zh: '正在下载更新...', | ||
| en: 'Downloading update...', | ||
| ja: '更新をダウンロード中...', | ||
| tr: 'Güncelleme indiriliyor...', | ||
| hu: 'Frissítés letöltése...', | ||
| }, | ||
| downloaded: { | ||
| zh: '下载完毕，点击安装并重启', | ||
| en: 'Download completed. Click to install and restart', | ||
| ja: 'ダウンロードが完了しました。クリックしてインストールして再起動してください', | ||
| tr: 'İndirme tamamlandı. Kurmak ve yeniden başlatmak için tıklayın', | ||
| hu: 'Letöltés kész. Kattintson a telepítéshez és az újraindításhoz', | ||
| }, | ||
| cancel: { | ||
| zh: '取消更新', | ||
| en: 'Cancel update', | ||
| ja: '更新をキャンセル', | ||
| tr: 'Güncellemeyi iptal et', | ||
| hu: 'Frissítés megszakítása', | ||
| }, | ||
| install: { | ||
| zh: '安装并重启', | ||
| en: 'Install and Restart', | ||
| ja: 'インストールして再起動', | ||
| tr: 'Kur ve Yeniden Başlat', | ||
| hu: 'Telepítés és újraindítás', | ||
| }, | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,109 +1,82 @@ | ||
| import { dialog, BrowserWindow } from 'electron' | ||
| import { BrowserWindow } from 'electron' | ||
| import axios from 'axios' | ||
| import version from '@/version' | ||
| import useServices from '@/database/useServices' | ||
|
|
||
| const { autoUpdater } = require('electron-updater') | ||
| const { dialog } = require('electron') | ||
| const Store = require('electron-store') | ||
| const electronStore = new Store() | ||
|
|
||
| const release = 'https://api.github.com/repos/emqx/MQTTX/releases/latest' | ||
| let language: string = 'en' | ||
| const log4js = require('log4js') | ||
|
|
||
| const isUpdate = (latest: string, current: string): boolean => { | ||
| const latestVersion: number[] = latest.split('.').map((item) => parseInt(item, 10)) | ||
| const currentVersion: number[] = current.split('.').map((item) => parseInt(item, 10)) | ||
| let update: boolean = false | ||
|
|
||
| for (let i: number = 0; i < 3; i++) { | ||
| if (currentVersion[i] < latestVersion[i]) { | ||
| update = true | ||
| } | ||
| } | ||
| log4js.configure({ | ||
| appenders: { | ||
| console: { | ||
| type: 'console', | ||
| }, | ||
| file: { | ||
| type: 'file', | ||
| filename: './logs/app.log', // 指定日志文件路径 | ||
| }, | ||
| }, | ||
| categories: { | ||
| default: { | ||
| appenders: ['console', 'file'], | ||
| level: 'debug', | ||
| }, | ||
| }, | ||
| }) | ||
|
|
||
| return update | ||
| } | ||
| const logger = log4js.getLogger('file') | ||
|
|
||
| const autoDownload = (latest: string, language: string): void => { | ||
| const urlLang = language === 'zh' ? 'zh' : 'en' | ||
| const downloadUrl = `https://www.emqx.com/${urlLang}/downloads/MQTTX/${latest}` | ||
| autoUpdater.setFeedURL(downloadUrl) | ||
| autoUpdater.checkForUpdatesAndNotify() | ||
| autoUpdater.on('checking-for-update', () => {}) | ||
| autoUpdater.on('update-available', () => {}) | ||
| autoUpdater.on('update-not-available', () => {}) | ||
| autoUpdater.on('error', () => {}) | ||
| autoUpdater.on('download-progress', () => {}) | ||
| autoUpdater.on('update-downloaded', () => { | ||
| electronStore.set('isShow', true) | ||
| dialog | ||
| .showMessageBox({ | ||
| type: 'info', | ||
| title: 'New Version', | ||
| buttons: ['Install', 'No'], | ||
| message: `Update available: ${latest}`, | ||
| }) | ||
| .then((res) => { | ||
| if (res.response === 0) { | ||
| // if selected yes | ||
| autoUpdater.quitAndInstall() | ||
| } else { | ||
| dialog.showMessageBox({ | ||
| type: 'info', | ||
| message: 'Automatic update on do not shut down the computer immediately', | ||
| }) | ||
| } | ||
| }) | ||
| }) | ||
| export interface versionDetail { | ||
| version: string | ||
| detail: string | ||
| } | ||
|
|
||
| const updateChecker = async (isAuto: boolean = true): Promise<void | boolean> => { | ||
| const response = await axios.get(release) | ||
| export const getCurrentLang = async (): Promise<string> => { | ||
| let language: string = 'en' | ||
| const { settingService } = useServices() | ||
| await settingService.set() | ||
| const setting = await settingService.get() | ||
| if (setting) { | ||
| language = setting.currentLang | ||
| } | ||
| if (response.status === 200) { | ||
| const latest: string = response.data.name | ||
| const isPrerelease: boolean = response.data.prerelease | ||
| if (latest && isUpdate(latest.slice(1, 6), version) && !isPrerelease) { | ||
| autoDownload(latest, language) | ||
| } else { | ||
| if (!isAuto) { | ||
| dialog.showMessageBox({ | ||
| type: 'info', | ||
| title: '', | ||
| buttons: ['OK'], | ||
| message: 'There are currently no updates available.', | ||
| }) | ||
| return language === 'zh' ? 'zh' : 'en' | ||
| } | ||
|
|
||
| const getUpdateDtail = async (current: string): Promise<versionDetail | null> => { | ||
| const tagsUrl = 'https://api.github.com/repos/emqx/MQTTX/tags' | ||
| const tagsRes = await axios.get(tagsUrl) | ||
| if (tagsRes.status === 200) { | ||
| const tagsList: string[] = tagsRes.data.map((item: any) => item.name) | ||
| const latestTagsList: string[] = tagsList.slice(0, tagsList.indexOf(current)) | ||
| while (latestTagsList.length > 0) { | ||
| const latestVersion = latestTagsList.shift() | ||
| const versionRes = await axios.get( | ||
| `https://community-sites.emqx.com/api/v1/changelogs?product=MQTTX&version=${latestVersion}`, | ||
| ) | ||
| if (latestVersion && versionRes.status === 200) { | ||
| return { | ||
| version: latestVersion, | ||
| detail: versionRes.data.data.changelog, | ||
| } | ||
| } | ||
| } | ||
| } else { | ||
| return false | ||
| } | ||
| return null | ||
| } | ||
| //what's new window | ||
| export async function createUpdateWindow() { | ||
| const updateWindow = new BrowserWindow({ | ||
| width: 600, | ||
| height: 500, | ||
| webPreferences: { | ||
| nodeIntegration: true, | ||
| contextIsolation: false, | ||
| enableRemoteModule: true, | ||
| }, | ||
| }) | ||
| const { settingService } = useServices() | ||
| await settingService.set() | ||
| const setting = await settingService.get() | ||
| if (setting) { | ||
| language = setting.currentLang | ||
|
|
||
| export const updateChecker = async (isAuto: boolean = true): Promise<void | versionDetail | boolean> => { | ||
| const currentVersion = `v${version}` | ||
| const updateDatail: versionDetail | null = await getUpdateDtail(currentVersion) | ||
| const language: string = await getCurrentLang() | ||
| if (updateDatail) { | ||
| if (isAuto && electronStore.get('isIgnore') === updateDatail.version) { | ||
| return false | ||
| } | ||
| return updateDatail | ||
| } else { | ||
| return false | ||
| } | ||
| let link: string = 'https://mqttx.app' | ||
| link = language === 'zh' ? `${link}/zh` : link | ||
| updateWindow.loadURL(`${link}/changelogs/v${version}`) | ||
| electronStore.set('isShow', false) | ||
| } | ||
| export default updateChecker |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| import { BrowserWindow, IpcMain, IpcMainEvent, ipcMain } from 'electron' | ||
| import version from '@/version' | ||
| import { getCurrentLang, versionDetail } from './updateChecker' | ||
| import { resolve } from 'path' | ||
| const { autoUpdater } = require('electron-updater') | ||
| const Store = require('electron-store') | ||
| const electronStore = new Store() | ||
|
|
||
| export const autoDownload = (event: IpcMainEvent, updateDatail: versionDetail, language: string) => { | ||
| const downloadUrl = `https://www.emqx.com/${language}/downloads/MQTTX/${updateDatail.version}` | ||
| autoUpdater.setFeedURL(downloadUrl) | ||
| autoUpdater.autoDownload = false | ||
| autoUpdater.autoInstallOnAppQuit = false | ||
| autoUpdater.checkForUpdatesAndNotify() | ||
| autoUpdater.on('update-available', () => { | ||
| autoUpdater.downloadUpdate() | ||
| }) | ||
| autoUpdater.on('error', (e: any) => { | ||
| console.log(e) | ||
| }) | ||
| autoUpdater.on('download-progress', (progressObj: any) => { | ||
| event.sender.send('downloadProgressPercent', progressObj.percent) | ||
| }) | ||
| autoUpdater.on('update-downloaded', () => { | ||
| event.sender.send('downloadProgressPercent', 100) | ||
| }) | ||
| ipcMain.on('toQuitAndInstall', () => { | ||
| electronStore.set('isShow', true) | ||
| autoUpdater.quitAndInstall() | ||
| }) | ||
| ipcMain.on('cancelDownload', () => { | ||
| autoUpdater.removeAllListeners() | ||
| autoUpdater.autoDownload = false | ||
| autoUpdater.autoInstallOnAppQuit = false | ||
| autoUpdater.autoCheckForUpdates = false | ||
| }) | ||
| } | ||
|
|
||
| export async function createUpdateWindow() { | ||
| const updateWindow = new BrowserWindow({ | ||
| width: 600, | ||
| height: 500, | ||
| webPreferences: { | ||
| nodeIntegration: true, | ||
| contextIsolation: false, | ||
| enableRemoteModule: true, | ||
| }, | ||
| }) | ||
| const language: string = await getCurrentLang() | ||
| let link: string = 'https://mqttx.app' | ||
| link = language === 'zh' ? `${link}/zh` : link | ||
| updateWindow.loadURL(`${link}/changelogs/v${version}`) | ||
| electronStore.set('isShow', false) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.