zstrike/lucida
1
0
Fork 0
mirror of https://codeberg.org/lucida/lucida.git synced 2026-11-12 06:37:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

add the arl login work

Browse Source
This commit is contained in:
aria
2024-07-29 14:58:05 -04:00
parent 38a06fea80
commit d48482abac
3 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "lucida",
"version": "2.0.0-17",
"version": "2.0.0-18",
"description": "A modular music downloader tool",
"main": "build/index.js",
"type": "module",

4
src/index.ts
View File

@@ -30,11 +30,11 @@ class Lucida {
}
async login() {
if (!this.logins) throw new Error('No logins specified')
for (const i in this.logins) {
for (const i in this.modules) {
const credentials = this.logins[i]
const module = this.modules[i]
if (module && 'login' in module) {
await module.login?.(credentials.username, credentials.password)
await module.login?.(credentials?.username, credentials?.password)
}
}
}

52
src/streamers/deezer/main.ts
View File

@@ -77,7 +77,7 @@ export default class Deezer implements StreamerWithLogin {
availableFormats: Set<DeezerFormat> = new Set()
constructor(options?: DeezerOptions) {
if (options?.arl) this.#loginViaArl(options.arl)
if (options?.arl) this.arl = options.arl
}
async #apiCall<T extends keyof APIMethod>(
@@ -106,6 +106,7 @@ export default class Deezer implements StreamerWithLogin {
if (error.constructor.name == 'Object') {
const [type, msg] = Object.entries(error)[0]
if (type == 'VALID_TOKEN_REQUIRED') throw new Error('Invalid ARL')
throw new Error(`API Error: ${type}\n${msg}`)
}
@@ -152,32 +153,31 @@ export default class Deezer implements StreamerWithLogin {
async login(username: string, password: string): Promise<void> {
if (this.arl) {
return
await this.#loginViaArl(this.arl)
} else {
const resp = await fetch('https://www.deezer.com/', { headers: this.headers })
const setCookie = resp.headers.get('Set-Cookie') ?? ''
const sid = setCookie.match(/sid=(fr[0-9a-f]+)/)![1]
this.headers['Cookie'] = `sid=${sid}`
password = this.#md5(password)
const loginReq = await fetch(
`https://connect.deezer.com/oauth/user_auth.php?${new URLSearchParams({
app_id: CLIENT_ID,
login: username,
password,
hash: this.#md5(CLIENT_ID + username + password + CLIENT_SECRET)
})}`,
{ headers: this.headers }
)
const { error } = <DeezerLoginResponse>await loginReq.json()
if (error) throw new Error('Error while getting access token, check your credentials')
const arl = await this.#apiCall('user.getArl')
await this.#loginViaArl(arl)
}
const resp = await fetch('https://www.deezer.com/', { headers: this.headers })
const setCookie = resp.headers.get('Set-Cookie') ?? ''
const sid = setCookie.match(/sid=(fr[0-9a-f]+)/)![1]
this.headers['Cookie'] = `sid=${sid}`
password = this.#md5(password)
const loginReq = await fetch(
`https://connect.deezer.com/oauth/user_auth.php?${new URLSearchParams({
app_id: CLIENT_ID,
login: username,
password,
hash: this.#md5(CLIENT_ID + username + password + CLIENT_SECRET)
})}`,
{ headers: this.headers }
)
const { error } = <DeezerLoginResponse>await loginReq.json()
if (error) throw new Error('Error while getting access token, check your credentials')
const arl = await this.#apiCall('user.getArl')
await this.#loginViaArl(arl)
}
/* ---------- SEARCH ---------- */