Added correct deemix lib version + check deezer availability

This commit is contained in:
RemixDev
2021-06-29 00:06:11 +02:00
parent 9b157c42bc
commit 6183f9b7a6
6 changed files with 38 additions and 14 deletions

View File

@@ -1,7 +1,7 @@
import { RequestHandler } from 'express'
// @ts-expect-error
import { Deezer } from 'deezer-js'
import { sessionDZ, startQueue } from '../../../main'
import { sessionDZ, startQueue, deezerAvailable, isDeezerAvailable } from '../../../main'
import { ApiHandler } from '../../../types'
export interface RawLoginArlQuery {
@@ -22,6 +22,7 @@ const path: ApiHandler['path'] = '/login-arl'
const handler: RequestHandler<{}, {}, {}, RawLoginArlQuery> = async (req, res, _) => {
if (!sessionDZ[req.session.id]) sessionDZ[req.session.id] = new Deezer()
const dz = sessionDZ[req.session.id]
if (deezerAvailable === null) await isDeezerAvailable()
if (!req.query) {
return res.status(400).send()
@@ -52,6 +53,7 @@ const handler: RequestHandler<{}, {}, {}, RawLoginArlQuery> = async (req, res, _
const testDz = new Deezer()
response = await testDz.login_via_arl(...loginParams)
}
if (!deezerAvailable) response = LoginStatus.NOT_AVAILABLE
const returnValue = { status: response, arl: req.query.arl, user: dz.current_user }
startQueue(dz)

View File

@@ -1,9 +1,10 @@
import express from 'express'
// @ts-expect-error
import { Deezer } from 'deezer-js'
import { sessionDZ, getQueue } from '../main'
import { sessionDZ, getQueue, deemixVersion, isDeezerAvailable, deezerAvailable } from '../main'
const router = express.Router()
let update: any = null
/**
* GET home page
@@ -14,20 +15,25 @@ router.get('/', (_, res) => {
res.render('index', { title: 'deemix' })
})
router.get('/connect', (req, res) => {
router.get('/connect', async (req, res) => {
if (!sessionDZ[req.session.id]) sessionDZ[req.session.id] = new Deezer()
const dz = sessionDZ[req.session.id]
const result: any = {
update: {
if (!update) {
update = {
currentCommit: 'testing',
latestCommit: 'testing',
updateAvailable: false,
deemixVersion: '3.0_beta'
},
deemixVersion
}
}
if (deezerAvailable === null) await isDeezerAvailable()
const result: any = {
update,
autologin: !dz.logged_in,
currentUser: dz.current_user,
deezerNotAvailable: false
deezerAvailable
}
const queue = getQueue()