Fixed lint issues

server/src/main.ts

@@ -12,8 +12,8 @@ const Downloader = deemix.downloader.Downloader
 const { Single, Collection, Convertable } = deemix.types.downloadObjects
 export const defaultSettings: Settings = deemix.settings.DEFAULTS
 export const configFolder: string = deemix.utils.localpaths.getConfigFolder()
-export let settings: any = deemix.settings.load(configFolder)
 export const sessionDZ: any = {}
+let settings: any = deemix.settings.load(configFolder)
 
 export const getAccessToken = deemix.utils.deezer.getAccessToken
 export const getArlFromAccessToken = deemix.utils.deezer.getArlFromAccessToken
@@ -47,12 +47,23 @@ export function saveSettings(newSettings: any, newSpotifySettings: any) {
 	plugins.spotify.setCredentials(newSpotifySettings)
 }
 
-export let queueOrder: string[] = []
-export const queue: any = {}
-export let currentJob: any = null
+let queueOrder: string[] = []
+const queue: any = {}
+let currentJob: any = null
 
 restoreQueueFromDisk()
 
+export function getQueue() {
+	const result: any = {
+		queue,
+		queueOrder
+	}
+	if (currentJob && currentJob !== true) {
+		result.current = currentJob.downloadObject.getSlimmedDict()
+	}
+	return result
+}
+
 export async function addToQueue(dz: any, url: string[], bitrate: number) {
 	if (!dz.logged_in) throw new NotLoggedIn()
 
@@ -146,7 +157,7 @@ export async function startQueue(dz: any): Promise<any> {
 
 		if (!downloadObject.isCanceled) {
 			// Set status
-			if (downloadObject.failed == downloadObject.size) {
+			if (downloadObject.failed === downloadObject.size) {
 				queue[currentUUID].status = 'failed'
 			} else if (downloadObject.failed > 0) {
 				queue[currentUUID].status = 'withErrors'

server/src/routes/api/get/getQueue.ts

@@ -1,18 +1,13 @@
 // import { Deezer } from 'deezer-js'
 import { ApiHandler } from '../../../types'
-import { queueOrder, queue, currentJob } from '../../../main'
+import { getQueue } from '../../../main'
 
 const path: ApiHandler['path'] = '/getQueue'
 
 // let homeCache: any
 
 const handler: ApiHandler['handler'] = (_, res) => {
-	const result: any = {
-		queue,
-		order: queueOrder
-	}
-	if (currentJob) result.currentItem = currentJob.downloadObject.getSlimmedDict()
-
+	const result: any = getQueue()
 	res.send(result)
 }
 

server/src/routes/api/post/addToQueue.ts

@@ -1,7 +1,7 @@
 // @ts-expect-error
 import { Deezer } from 'deezer-js'
 import { ApiHandler } from '../../../types'
-import { sessionDZ, addToQueue, settings, listener } from '../../../main'
+import { sessionDZ, addToQueue, getSettings, listener } from '../../../main'
 
 const path: ApiHandler['path'] = '/addToQueue'
 
@@ -11,7 +11,7 @@ const handler: ApiHandler['handler'] = async (req, res) => {
 
 	const url = req.query.url.split(';')
 	let bitrate = req.query.bitrate
-	if (bitrate === 'null') bitrate = settings.maxBitrate
+	if (bitrate === 'null') bitrate = getSettings().settings.maxBitrate
 	let obj: any
 
 	try {

server/src/routes/api/post/login-arl.ts

@@ -19,7 +19,7 @@ const LoginStatus = {
 
 const path: ApiHandler['path'] = '/login-arl'
 
-const handler: RequestHandler<{}, {}, {}, RawLoginArlQuery> = async (req, res, next) => {
+const handler: RequestHandler<{}, {}, {}, RawLoginArlQuery> = async (req, res, _) => {
 	if (!sessionDZ[req.session.id]) sessionDZ[req.session.id] = new Deezer()
 	const dz = sessionDZ[req.session.id]
 

server/src/routes/index.ts

@@ -1,7 +1,7 @@
 import express from 'express'
 // @ts-expect-error
 import { Deezer } from 'deezer-js'
-import { sessionDZ, queue, queueOrder, currentJob } from '../main'
+import { sessionDZ, getQueue } from '../main'
 
 const router = express.Router()
 
@@ -30,14 +30,10 @@ router.get('/connect', (req, res) => {
 		deezerNotAvailable: false
 	}
 
-	if (Object.keys(queue).length > 0) {
-		result.queue = {
-			queue,
-			queueOrder
-		}
-		if (currentJob && currentJob !== true) {
-			result.queue.current = currentJob.downloadObject.getSlimmedDict()
-		}
+	const queue = getQueue()
+
+	if (Object.keys(queue.queue).length > 0) {
+		result.queue = queue
 	}
 
 	res.send(result)