add tray icon, fix login if password changed

This commit is contained in:
HorizonCode 2023-05-31 07:02:05 +02:00
parent 232043d686
commit 0a664d1f64
3 changed files with 56 additions and 7 deletions

41
app.js
View File

@ -1,4 +1,4 @@
const { app, BrowserWindow, ipcMain, dialog } = require('electron'); const { app, BrowserWindow, ipcMain, dialog, Tray, Menu } = require('electron');
const { setupTitlebar, attachTitlebarToWindow } = require('custom-electron-titlebar/main'); const { setupTitlebar, attachTitlebarToWindow } = require('custom-electron-titlebar/main');
const windowManager = require('./ui/windowManager'); const windowManager = require('./ui/windowManager');
const osuUtil = require('./osuUtil'); const osuUtil = require('./osuUtil');
@ -9,6 +9,7 @@ const rpc = require('./discordPresence');
const windowName = require('get-window-by-name'); const windowName = require('get-window-by-name');
const terminalUtil = require('./terminalUtil'); const terminalUtil = require('./terminalUtil');
const osUtil = require('./osUtil'); const osUtil = require('./osUtil');
const appInfo = require('./appInfo');
let tempOsuPath; let tempOsuPath;
let osuWindowInfo; let osuWindowInfo;
@ -119,10 +120,37 @@ const run = () => {
let mainWindow; let mainWindow;
let tray = null
app.whenReady().then(() => { app.whenReady().then(() => {
tray = new Tray('./assets/logo.png');
const trayMenuTemplate = [
{
label: `EZPPLauncher ${appInfo.appVersion}`,
enabled: false
},
{
label: "Show/Hide",
click: function () {
if (mainWindow.isVisible()) mainWindow.hide();
else mainWindow.show();
}
},
{
label: 'Exit',
click: function () {
app.exit(0);
}
}
]
let trayMenu = Menu.buildFromTemplate(trayMenuTemplate)
tray.setContextMenu(trayMenu)
mainWindow = createWindow(); mainWindow = createWindow();
mainWindow.on('show', async () => { mainWindow.once('show', async () => {
await updateConfigVars(mainWindow); await updateConfigVars(mainWindow);
await tryLogin(mainWindow); await tryLogin(mainWindow);
await doUpdateCheck(mainWindow); await doUpdateCheck(mainWindow);
@ -187,10 +215,10 @@ const run = () => {
} }
rpc.updateState("Launching osu!..."); rpc.updateState("Launching osu!...");
isIngame = true; isIngame = true;
mainWindow.hide(); if (mainWindow.isVisible()) mainWindow.hide();
const result = await osuUtil.startOsuWithDevServer(tempOsuPath, "ez-pp.farm", async () => { const result = await osuUtil.startOsuWithDevServer(tempOsuPath, "ez-pp.farm", async () => {
isIngame = false; isIngame = false;
mainWindow.show(); if (!mainWindow.isVisible()) mainWindow.show();
await doUpdateCheck(mainWindow); await doUpdateCheck(mainWindow);
}); });
return result; return result;
@ -287,8 +315,11 @@ async function tryLogin(window) {
user: loginResponse.user user: loginResponse.user
}) })
} else { } else {
await config.remove("username");
await config.remove("password");
window.webContents.send('account_update', { window.webContents.send('account_update', {
type: "login-failed" type: "login-failed",
message: loginResponse.message
}) })
} }
} else { } else {

View File

@ -1,10 +1,18 @@
const axios = require('axios').default; const axios = require('axios').default;
const loginCheckEndpoint = 'https://ez-pp.farm/login/check'; const loginCheckEndpoint = 'https://ez-pp.farm/login/check';
let retries = 0;
const performLogin = async (username, password) => { const performLogin = async (username, password) => {
const result = await axios.post(loginCheckEndpoint, { username, password }); const result = await axios.post(loginCheckEndpoint, { username, password });
const code = result.data.code ?? 404;
if (code === 200 || code === 403) {
retries = 0;
return result.data; return result.data;
} else {
if (retries++ >= 5) return { code: 403, message: "Login failed." }
return await performLogin(username, password);
}
} }
module.exports = { performLogin }; module.exports = { performLogin };

View File

@ -152,6 +152,16 @@ window.addEventListener('DOMContentLoaded', () => {
ipcRenderer.on('account_update', (event, data) => { ipcRenderer.on('account_update', (event, data) => {
switch (data.type) { switch (data.type) {
case "login-failed":
console.log(data);
Swal.fire({
title: 'Uh oh!',
text: data.message,
icon: 'error',
confirmButtonText: 'Okay'
});
changePage("launch");
break;
case "not-loggedin": case "not-loggedin":
changePage("launch"); changePage("launch");
break; break;