janishutz/MusicPlayer
1
0
Fork 0
mirror of https://github.com/janishutz/MusicPlayerV2.git synced 2025-11-25 21:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

some more progress on backend integration

Browse Source
This commit is contained in:
janis
2023-11-09 14:20:04 +01:00
parent 7e75da4d94
commit b37c6c3635
5 changed files with 119 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
frontend/src/app.js
View File

@@ -7,6 +7,7 @@ const bodyParser = require( 'body-parser' );
const dialog = require( 'electron' ).dialog;
const session = require( 'express-session' );
const indexer = require( './indexer.js' );
const axios = require( 'axios' );
app.use( bodyParser.urlencoded( { extended: false } ) );
@@ -19,6 +20,36 @@ app.use( session( {
} ) );
// TODO: Import from config
const remoteURL = 'https://music.janishutz.com';
const hasConnected = false;
const connect = () => {
if ( authKey !== '' ) {
axios.post( remoteURL + '/connect', { 'authKey': authKey } ).then( res => {
if ( res.status === 200 ) {
console.log( '[ BACKEND INTEGRATION ] Connection successful' );
hasConnected = true;
} else {
console.error( '[ BACKEND INTEGRATION ] Connection error occurred' );
}
} ).catch( err => {
console.error( err );
} );
return 'connecting';
} else {
return 'noAuthKey';
}
};
let authKey = '';
try {
authKey = '' + fs.readFileSync( path.join( __dirname + '/config/authKey.txt' ) );
} catch( err ) {};
connect();
let connectedClients = {};
let changedStatus = [];
@@ -33,11 +64,16 @@ let currentDetails = {
let connectedMain = {};
// TODO: Add backend integration
app.get( '/', ( request, response ) => {
response.sendFile( path.join( __dirname + '/client/showcase.html' ) );
} );
app.get( '/openSongs', ( req, res ) => {
// res.send( '{ "data": [ "/home/janis/Music/KB2022" ] }' );
// res.send( '{ "data": [ "/mnt/storage/SORTED/Music/audio/KB2022" ] }' );
res.send( { 'data': dialog.showOpenDialogSync( { properties: [ 'openDirectory' ], title: 'Open music library folder' } ) } );
} );
app.get( '/showcase.js', ( req, res ) => {
res.sendFile( path.join( __dirname + '/client/showcase.js' ) );
} );
@@ -86,6 +122,16 @@ const sendUpdate = ( update ) => {
for ( let client in connectedClients ) {
connectedClients[ client ].write( 'data: ' + JSON.stringify( { 'type': update, 'data': currentDetails[ update ] } ) + '\n\n' );
}
// TODO: Check if connected and if not, try to authenticate with data from authKey file
// TODO: reduce request count by bundling and sending more in one go to reduce load
if ( hasConnected ) {
axios.post( remoteURL + '/statusUpdate', { 'data': 'hello' } ).then( res => {
console.log( res );
} ).catch( err => {
console.error( err );
} );
}
}
const allowedTypes = [ 'playingSong', 'isPlaying', 'songQueue', 'pos', 'queuePos' ];
@@ -113,12 +159,6 @@ app.get( '/clientStatusUpdate/:status', ( req, res ) => {
}
} );
app.get( '/openSongs', ( req, res ) => {
// res.send( '{ "data": [ "/home/janis/Music/KB2022" ] }' );
res.send( '{ "data": [ "/mnt/storage/SORTED/Music/audio/KB2022" ] }' );
// res.send( { 'data': dialog.showOpenDialogSync( { properties: [ 'openDirectory' ], title: 'Open music library folder' } ) } );
} );
app.get( '/indexDirs', ( req, res ) => {
if ( req.query.dir ) {
indexer.index( req ).then( dirIndex => {