mirror of
https://codeberg.org/lucida/lucida.git
synced 2026-11-20 18:45:41 -05:00
fixup deezer types
This commit is contained in:
@@ -16,6 +16,8 @@ import {
|
|||||||
DeezerAlbum,
|
DeezerAlbum,
|
||||||
DeezerArtist,
|
DeezerArtist,
|
||||||
DeezerFormat,
|
DeezerFormat,
|
||||||
|
DeezerLoginResponse,
|
||||||
|
DeezerMediaResponse,
|
||||||
DeezerTrack,
|
DeezerTrack,
|
||||||
DeezerUserData,
|
DeezerUserData,
|
||||||
parseAlbum,
|
parseAlbum,
|
||||||
@@ -78,7 +80,7 @@ export default class Deezer implements StreamerWithLogin {
|
|||||||
if (options?.arl) this.#loginViaArl(options.arl)
|
if (options?.arl) this.#loginViaArl(options.arl)
|
||||||
}
|
}
|
||||||
|
|
||||||
async #apiCall<T extends keyof APIMethod>(method: T, data?: any): Promise<APIMethod[T]> {
|
async #apiCall<T extends keyof APIMethod>(method: T, data: { [key: string]: string | number | string[] } = {}): Promise<APIMethod[T]> {
|
||||||
let apiToken = this.apiToken
|
let apiToken = this.apiToken
|
||||||
if (method == 'deezer.getUserData' || method == 'user.getArl') apiToken = ''
|
if (method == 'deezer.getUserData' || method == 'user.getArl') apiToken = ''
|
||||||
|
|
||||||
@@ -90,13 +92,18 @@ export default class Deezer implements StreamerWithLogin {
|
|||||||
cid: Math.floor(Math.random() * 1e9).toString()
|
cid: Math.floor(Math.random() * 1e9).toString()
|
||||||
})}`
|
})}`
|
||||||
|
|
||||||
const body = data ? JSON.stringify(data) : undefined
|
interface DeezerResponse {
|
||||||
|
results: APIMethod[T];
|
||||||
|
error: number[] | { [key: string]: string }
|
||||||
|
}
|
||||||
|
|
||||||
|
const body = JSON.stringify(data)
|
||||||
const req = await fetch(url, { method: 'POST', body, headers: this.headers })
|
const req = await fetch(url, { method: 'POST', body, headers: this.headers })
|
||||||
const { results: res, error, payload } = (await req.json()) as any
|
const { results, error } = <DeezerResponse>await req.json()
|
||||||
|
|
||||||
if (error.constructor.name == 'Object') {
|
if (error.constructor.name == 'Object') {
|
||||||
const [type, msg] = Object.entries(error)[0]
|
const [type, msg] = Object.entries(error)[0]
|
||||||
throw new Error(`API Error: ${type}\n${msg}\n\nPayload: ${payload}`)
|
throw new Error(`API Error: ${type}\n${msg}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (method == 'deezer.getUserData') {
|
if (method == 'deezer.getUserData') {
|
||||||
@@ -104,8 +111,10 @@ export default class Deezer implements StreamerWithLogin {
|
|||||||
const sid = setCookie.match(/sid=(fr[0-9a-f]+)/)![1]
|
const sid = setCookie.match(/sid=(fr[0-9a-f]+)/)![1]
|
||||||
this.headers['Cookie'] += `arl=${this.arl}; sid=${sid}`
|
this.headers['Cookie'] += `arl=${this.arl}; sid=${sid}`
|
||||||
|
|
||||||
this.apiToken = res?.checkForm
|
const res = <APIMethod['deezer.getUserData']>results
|
||||||
this.licenseToken = res?.USER?.OPTIONS?.license_token
|
|
||||||
|
this.apiToken = res.checkForm
|
||||||
|
this.licenseToken = res.USER?.OPTIONS?.license_token
|
||||||
|
|
||||||
this.country = res?.COUNTRY
|
this.country = res?.COUNTRY
|
||||||
this.language = res?.USER?.SETTING?.global?.language
|
this.language = res?.USER?.SETTING?.global?.language
|
||||||
@@ -117,7 +126,7 @@ export default class Deezer implements StreamerWithLogin {
|
|||||||
this.renewTimestamp = Date.now()
|
this.renewTimestamp = Date.now()
|
||||||
}
|
}
|
||||||
|
|
||||||
return res
|
return results
|
||||||
}
|
}
|
||||||
|
|
||||||
async #loginViaArl(arl: string) {
|
async #loginViaArl(arl: string) {
|
||||||
@@ -159,7 +168,7 @@ export default class Deezer implements StreamerWithLogin {
|
|||||||
})}`,
|
})}`,
|
||||||
{ headers: this.headers }
|
{ headers: this.headers }
|
||||||
)
|
)
|
||||||
const { error } = (await loginReq.json()) as any
|
const { error } = <DeezerLoginResponse>await loginReq.json()
|
||||||
|
|
||||||
if (error) throw new Error('Error while getting access token, check your credentials')
|
if (error) throw new Error('Error while getting access token, check your credentials')
|
||||||
|
|
||||||
@@ -414,7 +423,7 @@ export default class Deezer implements StreamerWithLogin {
|
|||||||
track_tokens: [trackToken]
|
track_tokens: [trackToken]
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
const res = (await req.json()) as any
|
const res = <DeezerMediaResponse>await req.json()
|
||||||
|
|
||||||
return res.data[0].media[0].sources[0].url
|
return res.data[0].media[0].sources[0].url
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,13 +7,41 @@ export enum DeezerFormat {
|
|||||||
FLAC = 9
|
FLAC = 9
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface DeezerLoginResponse {
|
||||||
|
error?: {
|
||||||
|
type: string
|
||||||
|
message: string
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface DeezerMediaResponse {
|
||||||
|
data: [{
|
||||||
|
media: [{
|
||||||
|
sources: [{
|
||||||
|
url: string
|
||||||
|
}]
|
||||||
|
}]
|
||||||
|
}]
|
||||||
|
}
|
||||||
|
|
||||||
export interface DeezerUserData {
|
export interface DeezerUserData {
|
||||||
USER: {
|
USER: {
|
||||||
USER_ID: number
|
USER_ID: number
|
||||||
EXPLICIT_CONTENT_LEVEL: string
|
EXPLICIT_CONTENT_LEVEL: string
|
||||||
|
OPTIONS: {
|
||||||
|
license_token: string
|
||||||
|
web_hq: boolean
|
||||||
|
web_lossless: boolean
|
||||||
|
}
|
||||||
|
SETTING: {
|
||||||
|
global: {
|
||||||
|
language: string
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
OFFER_ID: number
|
OFFER_ID: number
|
||||||
COUNTRY: string
|
COUNTRY: string
|
||||||
|
checkForm: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface DeezerArtist {
|
export interface DeezerArtist {
|
||||||
|
|||||||
Reference in New Issue
Block a user