From aeb0ba63200d9fc219cd085a608cfa4611eb4bd8 Mon Sep 17 00:00:00 2001 From: Raphix Date: Sat, 29 Apr 2023 14:43:58 +0200 Subject: [PATCH] 2.0.0 PreRelease --- main.js | 38 +++++++++++++++++++++++++--- package.json | 4 +-- templates/app/app.js | 54 ++++++++++++++++------------------------ templates/login/login.js | 22 ++++++++++++++-- 4 files changed, 78 insertions(+), 40 deletions(-) diff --git a/main.js b/main.js index 15e3d55..09a3474 100644 --- a/main.js +++ b/main.js @@ -55,8 +55,6 @@ async function createWindow() { }) - - } @@ -110,7 +108,35 @@ async function createWindow() { ipc.on("retryLogin", () => { log.client("Reconnexion au serveur ... Progressing !") + socket.close() socket.connect() + }) + + + ipc.on("stateOfConnection", () => { + + if(socket.disconnected == true) { + socket.connect() + + } else { + + if(!fs.existsSync( __dirname + path.sep + "settings.json")) { + win.webContents.send("connectSuccess") + } else { + + const settings = require( __dirname + path.sep + "settings.json") + + if(settings.token) { + log.client("Auth : Connexion avec le Token Discord !") + socket.emit("authByToken", settings.token) + } else { + + win.webContents.send("connectSuccess") + } + + } + } + }) ipc.on("discordlogin", () => { @@ -128,6 +154,12 @@ async function createWindow() { log.client("Discord Auth : Erreur lors de la connexion vers Discord !") }) + socket.on("checkFailed", () => { + win.webContents.send("discordCheckFailed") + win.restore() + log.client("Discord Auth : Erreur lors de la vérification de Discord !") + }) + socket.on("authOpenLink", (link) => { log.client("Discord Auth : Redirection vers le service Discord !") shell.openExternal(link) @@ -309,7 +341,7 @@ async function createWindow() { socket.on("disconnect", async () => { await win.loadFile("templates/login/login.html") await win.webContents.send("connectFailed") - socket.connect() + }); } diff --git a/package.json b/package.json index 3feb2fb..250387a 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { "name": "subsonics-manager", - "version": "1.1.0", + "version": "2.0.0", "description": "Manager for subsonics", "main": "main.js", "scripts": { "start": "electron .", "dev": "set DEV=true& electron .", - "build": "electron-packager . submanager-app --platform='win32' --out='./dist/' --icon='./src/logo.ico' --overwrite --ignore='(settings.json)' && iscc 'C:\\Users\\picot\\OneDrive\\Bureau\\Developement\\SubSonics BOT\\manager\\dist\\compilescript.iss' " + "build": "electron-packager . submanager-app --platform='win32' --out='./dist/' --icon='./src/logo.ico' --overwrite --ignore='(settings.json)'" }, "repository": { diff --git a/templates/app/app.js b/templates/app/app.js index e526b87..e8e4c53 100644 --- a/templates/app/app.js +++ b/templates/app/app.js @@ -47,7 +47,7 @@ restart.addEventListener("click", () => { var durationAll = 0 var durationProgress = 0 var isPlaying = false -var changeMusic = null + settings.addEventListener("click", () => { @@ -69,7 +69,6 @@ listNumber.classList.add("exitNotShow") function setTime() { - durationBar.max = durationAll durationProgress += 1000 durationBar.value = durationProgress @@ -136,10 +135,7 @@ setInterval(() => { if(isPlaying == true) { setTime() - } - - - + } }, 1000) @@ -293,12 +289,8 @@ forward.addEventListener("click" ,() => { ipc.on("actualize", (ev, data) => { - isPlaying = false - - - console.log(data) onlineNumber.innerHTML = data.onlineNumber @@ -310,22 +302,7 @@ ipc.on("actualize", (ev, data) => { loop.innerHTML = '' } - - - - - if(data.playing == 1) { - play.innerHTML = '' - isPlaying = true - - } else { - - - play.innerHTML = '' - isPlaying = false - } - if(data.volume) { volCursor.step = 1 volCursor.max = 100 @@ -424,13 +401,14 @@ ipc.on("actualize", (ev, data) => { musicTitle.innerHTML = data.current.title } - - if(data.changeMusic != changeMusic && changeMusic != null) { - changeMusic = data.changeMusic - durationProgress = 0 - setTime() - } + durationProgress = 0 + durationAll = 0 + durationBar.value = 0 + durationText.innerHTML = "=:==/=:==" + + + if(data.durationAll) { isPlaying = true @@ -443,6 +421,8 @@ ipc.on("actualize", (ev, data) => { durationBar.value = durationProgress } else { + + isPlaying = false durationAll = 0 durationProgress = 0 @@ -457,14 +437,22 @@ ipc.on("actualize", (ev, data) => { if(data.playing == 1) { play.innerHTML = '' isPlaying = true - + setTime() } else { - + play.innerHTML = '' isPlaying = false + } + if(data.current && data.playing == 0) { + setTime() + + } + + + }) diff --git a/templates/login/login.js b/templates/login/login.js index c98d392..137be31 100644 --- a/templates/login/login.js +++ b/templates/login/login.js @@ -12,8 +12,12 @@ const minimizeBtn = document.getElementById("minimizeBtn") document.getElementById("version").innerHTML = packageJson.version +ipc.on("needRetry", () => { -ipc.send("retryLogin") + ipc.send("retryLogin") +}) + +ipc.send("stateOfConnection") closeBtn.addEventListener("click", () => { @@ -30,9 +34,10 @@ minimizeBtn.addEventListener("click", () => { ipc.on("connectSuccess", () => { - content.innerHTML = '

Connexion vers Discord


Pour contrôler le bot, vérifie ton compte Discord !
' + content.innerHTML = '

Connexion vers Discord


Pour contrôler le bot, vérifie ton compte Discord !
' const discordconnect = document.getElementById("discord-connect") const discorSpan = document.getElementById("discord-span") + const discordLogoSpan = document.getElementById("discordLogoSpan") discordconnect.addEventListener("click", () => { @@ -45,7 +50,20 @@ ipc.on("connectSuccess", () => { discorSpan.innerHTML = '' const reDiscord = document.getElementById("discord-connect") reDiscord.addEventListener("click", () => { + discordLogoSpan.innerHTML = '' + discorSpan.innerHTML = '' + ipc.send("discordlogin") + }) + }), + + ipc.on("discordCheckFailed", () => { + + discorSpan.innerHTML = '' + discordLogoSpan.innerHTML = "

Vérification échouée : Vous n'êtes pas sur le serveur de Code Luc Player ou vous n'avez pas le Code Scipio

" + const reDiscord = document.getElementById("discord-connect") + reDiscord.addEventListener("click", () => { + discordLogoSpan.innerHTML = '' discorSpan.innerHTML = '' ipc.send("discordlogin") })