From f4e001767107d0d392bc54fa42c322333ea344fa Mon Sep 17 00:00:00 2001 From: Raphix Date: Mon, 11 Sep 2023 21:58:10 +0200 Subject: [PATCH] Version 0.9.0 - Ajout du Home Menu V2 --- README.md | 20 +-- data/playlist.json | 60 ++++++- data/radios.json | 13 ++ src/modules/global-variables.js | 1 + src/modules/sub-auth.js | 7 + src/modules/sub-radio.js | 64 +++++++ src/modules/sub-web.js | 109 +++++++++++- src/web/public/javascript/__index_script.js | 186 +++++++++++++++++++- src/web/public/stylesheets/style.css | 35 ++++ src/web/templates/index.ejs | 16 +- 10 files changed, 480 insertions(+), 31 deletions(-) create mode 100644 data/radios.json create mode 100644 src/modules/sub-radio.js diff --git a/README.md b/README.md index 54842f4..8f4b6d9 100644 --- a/README.md +++ b/README.md @@ -20,25 +20,6 @@ ## Changelog -### Subsonics - Web - 0.8.0 -- **Adds :** *Alerts, Playlist Share, Edit playlist picture | Tooltip* -#### Details - -**Alerts (Done)** -> - Popup Prefab -> - Declencher lors de l'action - -**Playlist Share (Done)** - -> - Envoyer des playlist avec la liste des utilisateurs - -**Tooltip (Done)** - -> - Tooltip sur les bouttons - -
- - ### Subsonics - Web - 0.9.0 - **Adds :** *Home Menu V2 | User Experience Improvements* #### Details @@ -53,6 +34,7 @@ > - Fix of Tooltip which is sometimes bugged > - Canva of Queue List +> - Support Live
diff --git a/data/playlist.json b/data/playlist.json index de8ec1a..0f34a6f 100644 --- a/data/playlist.json +++ b/data/playlist.json @@ -154,7 +154,65 @@ "isStream": false, "uri": "https://www.youtube.com/watch?v=3Ea7_6Qu2xo", "thumbnail": "https://img.youtube.com/vi/3Ea7_6Qu2xo/default.jpg" + }, + { + "track": "QAAAlgIAM2xvZmkgaGlwIGhvcCByYWRpbyDtoL3ts5ogLSBiZWF0cyB0byByZWxheC9zdHVkeSB0bwAJTG9maSBHaXJsf/////////8AC2pmS2ZQZnlKUmRrAQEAK2h0dHBzOi8vd3d3LnlvdXR1YmUuY29tL3dhdGNoP3Y9amZLZlBmeUpSZGsAB3lvdXR1YmUAAAAAAAAAAA==", + "title": "lofi hip hop radio 📚 - beats to relax/study to", + "identifier": "jfKfPfyJRdk", + "author": "Lofi Girl", + "duration": 9223372036854776000, + "isSeekable": false, + "isStream": true, + "uri": "https://www.youtube.com/watch?v=jfKfPfyJRdk", + "thumbnail": "https://img.youtube.com/vi/jfKfPfyJRdk/default.jpg" + } + ], + "Liste de lecture Immu": [ + { + "track": "QAAAhAIAIFRoYW5jcmVkIFdhdGVyczogVGhlIE1hbiAtIEZGWElWAApGbHVmZlN0dWZmAAAAAAAENiAAC3dGV1pMLTFJWG5jAAEAK2h0dHBzOi8vd3d3LnlvdXR1YmUuY29tL3dhdGNoP3Y9d0ZXWkwtMUlYbmMAB3lvdXR1YmUAAAAAAAAAAA==", + "title": "Thancred Waters: The Man - FFXIV", + "identifier": "wFWZL-1IXnc", + "author": "FluffStuff", + "duration": 276000, + "isSeekable": true, + "isStream": false, + "uri": "https://www.youtube.com/watch?v=wFWZL-1IXnc", + "thumbnail": "https://img.youtube.com/vi/wFWZL-1IXnc/default.jpg" + }, + { + "track": "QAAAvwIAYkZveGVzIHBlcmZvcm1zICdEb24ndCBTdG9wIE1lIE5vdycgb24gYm9hcmQgdGhlIE9yaWVudCBFeHByZXNzIC0gRG9jdG9yIFdobzogU2VyaWVzIDggKDIwMTQpIC0gQkJDAANCQkMAAAAAAAMVEAALaC1PVFlUMDJXN0UAAQAraHR0cHM6Ly93d3cueW91dHViZS5jb20vd2F0Y2g/dj1oLU9UWVQwMlc3RQAHeW91dHViZQAAAAAAAAAA", + "title": "Foxes performs 'Don't Stop Me Now' on board the Orient Express - Doctor Who: Series 8 (2014) - BBC", + "identifier": "h-OTYT02W7E", + "author": "BBC", + "duration": 202000, + "isSeekable": true, + "isStream": false, + "uri": "https://www.youtube.com/watch?v=h-OTYT02W7E", + "thumbnail": "https://img.youtube.com/vi/h-OTYT02W7E/default.jpg" + }, + { + "track": "QAAAjAIAKkRvY3RvciBXaG8gKDEtMTEpIHZpZDogR29uZSBpbiB0aGUgTW9ybmluZwAIc2hheWVyYTkAAAAAAAIqsAALazNWclpETVhIbUUAAQAraHR0cHM6Ly93d3cueW91dHViZS5jb20vd2F0Y2g/dj1rM1ZyWkRNWEhtRQAHeW91dHViZQAAAAAAAAAA", + "title": "Doctor Who (1-11) vid: Gone in the Morning", + "identifier": "k3VrZDMXHmE", + "author": "shayera9", + "duration": 142000, + "isSeekable": true, + "isStream": false, + "uri": "https://www.youtube.com/watch?v=k3VrZDMXHmE", + "thumbnail": "https://img.youtube.com/vi/k3VrZDMXHmE/default.jpg" + }, + { + "track": "QAAAhwIAJjMgRG9vcnMgRG93biAtIEtyeXB0b25pdGUgKFNtYWxsVmlsbGUpAAdXRUlMSU5OAAAAAAADikAAC0VPTzRWTjFHM0dZAAEAK2h0dHBzOi8vd3d3LnlvdXR1YmUuY29tL3dhdGNoP3Y9RU9PNFZOMUczR1kAB3lvdXR1YmUAAAAAAAAAAA==", + "title": "3 Doors Down - Kryptonite (SmallVille)", + "identifier": "EOO4VN1G3GY", + "author": "WEILINN", + "duration": 232000, + "isSeekable": true, + "isStream": false, + "uri": "https://www.youtube.com/watch?v=EOO4VN1G3GY", + "thumbnail": "https://img.youtube.com/vi/EOO4VN1G3GY/default.jpg" } ] - } + }, + "249494159629484033": {} } \ No newline at end of file diff --git a/data/radios.json b/data/radios.json new file mode 100644 index 0000000..e6873ca --- /dev/null +++ b/data/radios.json @@ -0,0 +1,13 @@ +[ + { + "track": "QAAAlgIAM2xvZmkgaGlwIGhvcCByYWRpbyDtoL3ts5ogLSBiZWF0cyB0byByZWxheC9zdHVkeSB0bwAJTG9maSBHaXJsf/////////8AC2pmS2ZQZnlKUmRrAQEAK2h0dHBzOi8vd3d3LnlvdXR1YmUuY29tL3dhdGNoP3Y9amZLZlBmeUpSZGsAB3lvdXR1YmUAAAAAAAAAAA==", + "title": "lofi hip hop radio 📚 - beats to relax/study to", + "identifier": "jfKfPfyJRdk", + "author": "Lofi Girl", + "duration": 9223372036854776000, + "isSeekable": false, + "isStream": true, + "uri": "https://www.youtube.com/watch?v=jfKfPfyJRdk", + "thumbnail": "https://img.youtube.com/vi/jfKfPfyJRdk/default.jpg" + } +] \ No newline at end of file diff --git a/src/modules/global-variables.js b/src/modules/global-variables.js index c78dafb..d3179dd 100644 --- a/src/modules/global-variables.js +++ b/src/modules/global-variables.js @@ -18,6 +18,7 @@ const __glob = { NODES: root + path.sep + "data" + path.sep + "nodes.json", README: root + path.sep + "README.md", PLAYLIST: root + path.sep + "data" + path.sep + "playlist.json", + RADIO: root + path.sep + "data" + path.sep + "radios.json", LOGS: root + path.sep + "src" + path.sep + "modules" + path.sep + "logs" }; diff --git a/src/modules/sub-auth.js b/src/modules/sub-auth.js index 2fbc42c..0641b75 100644 --- a/src/modules/sub-auth.js +++ b/src/modules/sub-auth.js @@ -168,6 +168,13 @@ module.exports.getUsersList = function () { } +module.exports.getSimpleUser = function (token) { + + var user = users.get(token) + + return ({"username": user.user.username, "global_name":user.user.global_name, "avatar": user.user.avatar, "id": user.user.id}) +} + module.exports.getUser = function (token) { return users.get(token) diff --git a/src/modules/sub-radio.js b/src/modules/sub-radio.js new file mode 100644 index 0000000..db96e5d --- /dev/null +++ b/src/modules/sub-radio.js @@ -0,0 +1,64 @@ +const { __glob } = require("../modules/global-variables"); +const { LogType } = require("./sub-log"); +var { List } = require("./sub-list") +const discord = require("./discord-bot") +const subplayer = require("./sub-player") +const fs = require("fs"); +const { type } = require("os"); +var radios = [] +const plog = new LogType("Radio-Manager") + +check() + + +module.exports.get = function () { + + check() + return radios + +} + +module.exports.add = function (data) { + + var radios_data = JSON.parse(fs.readFileSync(__glob.RADIO)) + + radios_data.push(data) + fs.writeFileSync(__glob.RADIO, JSON.stringify(radios_data, null, 2)) + + return radios + +} + +module.exports.remove = function(data) { + + var radios_data = JSON.parse(fs.readFileSync(__glob.RADIO)) + + var radIndex = -1 + + for(var radio of radios_data) { + + if(data.uri == radio.uri) { + + radIndex = radios_data.indexOf(radio) + + } + + } + + + radios_data.splice(radIndex, 1) + + fs.writeFileSync(__glob.RADIO, JSON.stringify(radios_data, null, 2)) +} + + +function check() { + + if(fs.existsSync(__glob.RADIO)) { + + radios = JSON.parse(fs.readFileSync(__glob.RADIO)) + } else { + + fs.writeFileSync(__glob.RADIO, JSON.stringify(radios, null, 2)) + } +} \ No newline at end of file diff --git a/src/modules/sub-web.js b/src/modules/sub-web.js index 0740172..bc12bfa 100644 --- a/src/modules/sub-web.js +++ b/src/modules/sub-web.js @@ -6,6 +6,7 @@ const auth = require("./sub-auth"); const cook = require("cookie") const wlog = new LogType("Web") const subplayer = require('./sub-player'); +const subradio = require("./sub-radio.js") const { List } = require("./sub-list") const subplaylist = require("./sub-playlist") const nodesfinder = require("./nodes-finder") @@ -141,6 +142,9 @@ function IOConnection(io) { const alog = log.getInstance("Authentification") + const usersOnline = new Array() + + process.on("UPDATE_NODES", () => { if(io) { @@ -152,6 +156,16 @@ function IOConnection(io) { + }) + + process.on("UPDATE_RADIO", () => { + + if(io) { + + const radioList = subradio.get() + io.sockets.emit("ALWAYS/ALL_RADIO", radioList) + } + }) process.on("MUSIC_UPDATE_STATE", () => { @@ -163,15 +177,38 @@ function IOConnection(io) { }) io.on("connection", (socket) => { + + var ucookies = socket.handshake.headers.cookie + ucookies = cook.parse(ucookies) + + if(ucookies.token) { + + var utoken = ucookies.token + const online_users_data = auth.getSimpleUser(utoken) + usersOnline.push(online_users_data) + } + + io.sockets.emit("ALWAYS/ALL_CONNECTED_USER", usersOnline) wlog.log("[SOCKET] - Nouvelle session : " + socket.id) + + socket.on("disconnect", () => { wlog.log("[SOCKET] - Fin de session : " + socket.id) + if(ucookies.token) { + + var utoken = ucookies.token + const online_users_data = auth.getSimpleUser(utoken) + usersOnline.splice(usersOnline.indexOf(online_users_data), 1) + } + + io.sockets.emit("ALWAYS/ALL_CONNECTED_USER", usersOnline) }) + // SPECIAL socket.on("GET/DISCORD_LOGIN_LINK", () => { @@ -394,6 +431,20 @@ function IOConnection(io) { }) + GetRequest(io, socket, "ALL_CONNECTED_USER", () => { + + + io.sockets.emit("ALWAYS/ALL_CONNECTED_USER", usersOnline) + + }) + + GetRequest(io, socket, "ALL_RADIO", () => { + + const radioList = subradio.get() + io.sockets.emit("ALWAYS/ALL_RADIO", radioList) + + }) + @@ -421,7 +472,61 @@ function IOConnection(io) { } } else { - io.emit("ANSWER/SEND/USERS/ADD", {"error":"TOKEN_NOT_FINDED"}) + io.emit("ANSWER/SEND/NODES/ADD", {"error":"TOKEN_NOT_FINDED"}) + + } + + + + }) + + socket.on("SEND/RADIO/ADD", async (data) => { + + + var cookies = socket.handshake.headers.cookie + + if(cookies) { + + cookies = cook.parse(cookies) + var token = cookies.token + + const user = auth.getUser(token) + + + if(user.admin == true) { + + const music_data = await (await subplayer.search(data)).results.tracks[0] + + var radioContains = null + + for(var title of subradio.get()) { + + if(title.uri == music_data.uri) { + + radioContains = true + } + } + + + if(!radioContains) { + + subradio.add(music_data) + console.log("[Radio] - ADD : " + data) + + } else { + + subradio.remove(music_data) + console.log("[Radio] - REMOVE : " + data) + + } + + + socket.emit("ANSWER/SEND/RADIO/ADD", "OK") + process.emit("UPDATE_RADIO") + } + + } else { + io.emit("ANSWER/SEND/RADIO/ADD", {"error":"TOKEN_NOT_FINDED"}) } @@ -716,7 +821,7 @@ function IOConnection(io) { const results = await subplayer.search(data) - + io.emit("ANSWER/SEND/SEARCH", results) diff --git a/src/web/public/javascript/__index_script.js b/src/web/public/javascript/__index_script.js index 2b9e301..2731fd8 100644 --- a/src/web/public/javascript/__index_script.js +++ b/src/web/public/javascript/__index_script.js @@ -59,8 +59,16 @@ var playlistValue = null var deleteJustBefore = null var currentSong = null +var isAdmin = false var playlistAvailable = null + + + + + + + restartBtn.addEventListener("click", () => { get("RESTART") @@ -95,6 +103,7 @@ document.onmousemove = function(e) showToolTip("admin", "Donner les permissions Administrateur", e) showToolTip("takeCurrent", "Ajouter le titre à une playlist", e) showToolTip("volbtn", "Volume", e) + showToolTip("radio_add", "Ajouter par l'URL", e) }; function showToolTip(id, text, e) { @@ -118,11 +127,138 @@ function showToolTip(id, text, e) { homeBtn.addEventListener("click", () => { - mainView.innerHTML = WelcomeContent - wasOnPlaylist = false + loadHome() }) + + + +function loadHome() { + + mainView.innerHTML = WelcomeContent + wasOnPlaylist = false + + + get("ALL_CONNECTED_USER") + + + get("ALL_RADIO") + + + +} + +socket.on("ALWAYS/ALL_CONNECTED_USER", (resp) => { + + const website_list = document.getElementById("website_list") + const userToPush = new Array() + + userToPush.push("

Personnes en ligne

") + + for(var user of resp ) { + + userToPush.push(`

${user.global_name}

${user.username}

`) + + } + + website_list.innerHTML = userToPush.join("") +}) + +socket.on("ALWAYS/ALL_RADIO", (resp) => { + + const radio_list = document.getElementById("radio_list") + const radioToPush = new Array() + + radioToPush.push("

Radio

") + radioToPush.push(` + +
+

Ajout d'une radio

+ +
+

+ +
+

URL

+ + +
+ +`) + + + + for(var title of resp ) { + + var thumbnail = title.thumbnail + if(!thumbnail) { + + thumbnail = "/images/black-image.svg" + + } + + radioToPush.push(`

${title.title}

${title.author}

`) + + } + + if(isAdmin) { + + radioToPush.push(` +
Ajouter une radio
`) + } + + radio_list.innerHTML = radioToPush.join("") + + + const radio_dialog = document.getElementById("radio_dialog") + const radio_close = document.getElementById("radio_close") + const radio_send = document.getElementById("radio_send") + const radio_add = document.getElementById("radio_add") + const radio_info = document.getElementById("radio_info") + const radio_host = document.getElementById("radio_host") + + radio_add.addEventListener("click", () => { + radio_info.innerHTML = "" + radio_host.value = "" + radio_dialog.showModal() + }) + + radio_close.addEventListener("click", () => { + radio_info.innerHTML = "" + radio_dialog.close() + }) + + radio_send.addEventListener("click", () => { + if(radio_host.value != '') { + + send("RADIO/ADD", radio_host.value) + radio_dialog.close() + } else { + + radio_info.innerHTML = "Remplissez une URL !" + } + + }) + + + for(var title of resp ) { + + var playBtn = document.getElementById(resp.indexOf(title) +'_radio_pplay') + + playBtn.addEventListener("click", () => { + send("ADD_SONG_NOW", resp[playBtn.id.replace("_radio_pplay", "")]) + + }) + } + + + + +}) + +loadHome() + function delPlayList(key) { send("DELETE_PLAYLIST", key) @@ -326,15 +462,23 @@ function loadPlaylist(key, value) { var thumbnail = title.thumbnail - if(!thumbnail) { + if(!thumbnail) { - thumbnail = "/images/black-image.svg" - } + thumbnail = "/images/black-image.svg" + + } + + if(title.duration == 9223372036854776000) { + + PFormatduration = " LIVE" + } playlist_songs.push('

' + title.title + '

' + title.author + '

' + PFormatduration + '

') } + + playlistToPush.push(``) playlistToPush.push('

' + key + '

' + playlist_songs.join("")) @@ -440,7 +584,14 @@ searchBtn.addEventListener("click", () => { thumbnail = "/images/black-image.svg" } + PFormatduration = pmax + + if(title.duration == 9223372036854776000) { + + PFormatduration = " LIVE" + } + contentToPush.push('

' + title.title + '

' + title.author + '

' + PFormatduration + '

Lire maintenant
Ajouter à une playlist
Copier le lien

Ajouter à une playlist

Selectionner la playlist

') } @@ -581,6 +732,12 @@ searchBtn.addEventListener("click", () => { } PFormatduration = pmax + + if(title.milis_length == 9223372036854776000) { + + PFormatduration = " LIVE" + } + playlist_songs.push('

' + title.title + '

' + title.author.name + '

' + PFormatduration + '

') @@ -833,6 +990,7 @@ userInfo.then(user => { if(user.admin == true) { settingsBtn.style.display = "flex" + isAdmin = true } userInfoDiv.innerHTML = "

" + user.user.global_name + "

" + user.user.username + "

" + betastar + "
" @@ -1018,6 +1176,23 @@ socket.on("/ALWAYS/MUSIC_STATE", (data) => { } + if(data.durationAll == 9223372036854776000) { + + isPlaying = false + durationAll = 0 + durationProgress = 0 + durationBar.disabled = true + durationBar.classList.add("grised") + durationBar.style.display = "none" + durationBar.value = 0 + durationTextAct.innerHTML = "" + durationTextTotal.innerHTML = " LIVE" + + } else { + + durationBar.style.display = "unset" + } + if(data.queue != null) { @@ -1158,3 +1333,4 @@ function setTime() { } + diff --git a/src/web/public/stylesheets/style.css b/src/web/public/stylesheets/style.css index 5a6ed33..021f6e2 100644 --- a/src/web/public/stylesheets/style.css +++ b/src/web/public/stylesheets/style.css @@ -1182,3 +1182,38 @@ p { text-align: center; opacity: 0.8; } + +.home_view { + + display: flex; + width: 100%; + height: 100%; +} + +.home_other { + + display: flex; + flex-direction: column; + width: 30%; + margin-left: 0.5%; + padding: 1%; +} + +.home_changelog { + + width: 70%; + overflow-y: auto; + padding: 1%; +} + +.home_radio { + + + height: 50%; +} + +.home_online { + + height: 50%; +} + diff --git a/src/web/templates/index.ejs b/src/web/templates/index.ejs index d065413..324dbf7 100644 --- a/src/web/templates/index.ejs +++ b/src/web/templates/index.ejs @@ -62,10 +62,18 @@