Altarik/Launcher
4
0
Fork 0
mirror of https://github.com/AltarikMC/Launcher synced 2024-11-22 06:19:50 +01:00
Code

Updated updater.js

Browse Source
This commit is contained in:
Quentin Legot 2022-08-20 11:15:12 +02:00
parent 8e6b490c07
commit 0001b54e15
6 changed files with 76 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/client/assets/js/checkingUpdate.js
View File

@ -1,3 +1,4 @@
const vue = require('vue/dist/vue.cjs.js')
app = vue.createApp({
data() {
return {
@ -19,6 +20,6 @@ app = vue.createApp({
app.mount("#vue");
ipcRenderer.on("update-status", (event, arg) => {
ipcRenderer.on("update-available", (event, arg) => {
this.fullscreenText = "Mise à jour disponible, téléchargement..."
});

1
src/client/assets/js/index.js
View File

@ -1,5 +1,6 @@
const os = require('os')
const totalMem = os.totalmem() / (1.049 * Math.pow(10, 6))
const vue = require('vue/dist/vue.cjs.js')
app = vue.createApp({
data() {

1
src/client/assets/js/login.js
View File

@ -1,3 +1,4 @@
const vue = require('vue/dist/vue.cjs.js')
app = vue.createApp({
data() {
return {

1
src/client/assets/js/preload.js
View File

@ -1,6 +1,5 @@
'use strict';
const { ipcRenderer } = require('electron');
const vue = require('vue/dist/vue.cjs.js')
let app;
window.addEventListener("DOMContentLoaded", () => {
const minimizeButton = document.getElementById("minimize-btn")

10
src/server/main.js
View File

@ -1,6 +1,9 @@
const { app, BrowserWindow, Menu, ipcMain, autoUpdater, dialog } = require('electron')
const logger = require('electron-log')
const { join } = require('path')
const updater = require('./updater.js')
let updaterInstance = null
if (require('electron-squirrel-startup')) {
require("./install.js").handleSquirrelEvent(app)
@ -27,7 +30,8 @@ function createWindow () {
})
//Menu.setApplicationMenu(null)
win.loadFile('src/client/checkingUpdate.html').then(() => {
require('./updater.js').configUpdater(app, autoUpdater, dialog, logger, showNotification)
updaterInstance = new updater.Updater(app, win, autoUpdater, dialog, logger, showNotification)
updaterInstance.configUpdater()
})
win.on("close", () => {
app.quit()
@ -91,3 +95,7 @@ ipcMain.on("pageReady", (event) => {
event.sender.send("nick", { name: minecraft.auth.name })
minecraft.getModsInformations(event)
})
ipcMain.on("checking-update", () => {
updaterInstance.checkForUpdates(win, showNotification)
})

72
src/server/updater.js
View File

@ -2,24 +2,35 @@ const isDev = require('electron-is-dev')
const pkg = require('../../package.json')
const server = 'https://update.electronjs.org'
function configUpdater(app, autoUpdater, dialog, logger, showNotification) {
logger.info(`electron version: ${process.versions['electron']}`)
logger.info(`chrome version: ${process.versions['chrome']}`)
logger.info(`Node version: ${process.versions['node']}`)
logger.info(`platform: ${process.platform}`)
logger.info(`arch: ${process.arch}`)
class Updater {
constructor(app, win, autoUpdater, dialog, logger, ipcMain) {
this.app = app
this.win = win
this.autoUpdater = autoUpdater
this.dialog = dialog
this.logger = logger
this.ipcMain = ipcMain
}
configUpdater() {
this.logger.info(`electron version: ${process.versions['electron']}`)
this.logger.info(`chrome version: ${process.versions['chrome']}`)
this.logger.info(`Node version: ${process.versions['node']}`)
this.logger.info(`platform: ${process.platform}`)
this.logger.info(`arch: ${process.arch}`)
if(isDev) {
logger.info(`developpement version ${app.getVersion()}`)
this.logger.info(`developpement version ${this.app.getVersion()}`)
this.win.loadFile('src/client/login.html')
return
}
logger.info(`production version ${app.getVersion()}`)
this.logger.info(`production version ${this.app.getVersion()}`)
const feed = `${server}/${pkg.repository}/${process.platform}-${process.arch}/${app.getVersion()}`
autoUpdater.setFeedURL(feed)
logger.info("Checking for update...")
autoUpdater.checkForUpdates()
const feed = `${server}/${pkg.repository}/${process.platform}-${process.arch}/${this.app.getVersion()}`
this.autoUpdater.setFeedURL(feed)
autoUpdater.on('update-downloaded', (_event, releaseNotes, releaseName) => {
// TODO : replace dialog by automatic restart
this.autoUpdater.on('update-downloaded', (_event, releaseNotes, releaseName) => {
const dialogOpts = {
type: 'info',
buttons: ['Rédémarrer', 'Plus tard'],
@ -28,26 +39,39 @@ function configUpdater(app, autoUpdater, dialog, logger, showNotification) {
detail: 'Une nouvelle version du launcher a été téléchargé. Redémarrez l\'application pour appliquer les mises à jour.'
}
dialog.showMessageBox(dialogOpts).then((returnValue) => {
this.dialog.showMessageBox(dialogOpts).then((returnValue) => {
if (returnValue.response === 0) {
logger.info("Leaving application to install update...")
autoUpdater.quitAndInstall()
this.logger.info("Leaving application to install update...")
this.autoUpdater.quitAndInstall()
}
})
})
autoUpdater.on('error', message => {
showNotification("Impossible de mettre à jour le launcher", "vérifier votre connexion", "warning")
logger.error('There was a problem updating the application')
logger.error(message)
}
checkForUpdates(win, showNotification) {
this.logger.info("Checking for update...")
this.autoUpdater.checkForUpdates()
this.autoUpdater.on('error', message => {
this.logger.error('There was a problem updating the application')
this.logger.error(message)
win.loadFile('src/client/login.html').then(() => {
showNotification("Une erreur est survenue lors de la vérification de la mise à jour", "Veuillez vérifier votre connexion internet et réessayer", "error")
})
})
autoUpdater.on('update-available', () => {
showNotification("Mise à jour", "Téléchargement de la mise à jour", "warning")
logger.info("update available, downloading...")
this.autoUpdater.on('update-available', () => {
this.logger.info("update available, downloading...")
win.webContents.send("update-available")
})
this.autoUpdater.on("update-not-available", () => {
this.logger.info("update not available")
win.loadFile('src/client/login.html')
})
}
}
module.exports = {
configUpdater
Updater
}