mirror of
https://codeberg.org/lucida/lucida.git
synced 2026-11-17 09:07:28 -05:00
add dispatcher support for all platforms
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
import { fetch } from 'undici'
|
import { Dispatcher, fetch } from 'undici'
|
||||||
import {
|
import {
|
||||||
Album,
|
Album,
|
||||||
Artist,
|
Artist,
|
||||||
@@ -29,6 +29,7 @@ import { Blowfish } from 'blowfish-cbc'
|
|||||||
|
|
||||||
interface DeezerOptions {
|
interface DeezerOptions {
|
||||||
arl?: string
|
arl?: string
|
||||||
|
dispatcher?: Dispatcher | undefined
|
||||||
}
|
}
|
||||||
|
|
||||||
interface APIMethod {
|
interface APIMethod {
|
||||||
@@ -86,11 +87,13 @@ export default class Deezer implements StreamerWithLogin {
|
|||||||
renewTimestamp?: number
|
renewTimestamp?: number
|
||||||
country?: string
|
country?: string
|
||||||
language?: string
|
language?: string
|
||||||
|
dispatcher?: Dispatcher | undefined
|
||||||
|
|
||||||
availableFormats: Set<DeezerFormat> = new Set()
|
availableFormats: Set<DeezerFormat> = new Set()
|
||||||
|
|
||||||
constructor(options?: DeezerOptions) {
|
constructor(options?: DeezerOptions) {
|
||||||
if (options?.arl) this.arl = options.arl
|
if (options?.arl) this.arl = options.arl
|
||||||
|
//if (options?.dispatcher) this.dispatcher = options.dispatcher
|
||||||
}
|
}
|
||||||
|
|
||||||
async #apiCall<T extends keyof APIMethod>(
|
async #apiCall<T extends keyof APIMethod>(
|
||||||
@@ -114,7 +117,12 @@ export default class Deezer implements StreamerWithLogin {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const body = JSON.stringify(data)
|
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,
|
||||||
|
dispatcher: this.dispatcher
|
||||||
|
})
|
||||||
const { results, error } = <DeezerResponse>await req.json()
|
const { results, error } = <DeezerResponse>await req.json()
|
||||||
|
|
||||||
if (error.constructor.name == 'Object') {
|
if (error.constructor.name == 'Object') {
|
||||||
@@ -167,7 +175,10 @@ export default class Deezer implements StreamerWithLogin {
|
|||||||
async login(username: string, password: string): Promise<void> {
|
async login(username: string, password: string): Promise<void> {
|
||||||
if (this.arl) await this.#loginViaArl(this.arl)
|
if (this.arl) await this.#loginViaArl(this.arl)
|
||||||
else {
|
else {
|
||||||
const resp = await fetch('https://www.deezer.com/', { headers: this.headers })
|
const resp = await fetch('https://www.deezer.com/', {
|
||||||
|
headers: this.headers,
|
||||||
|
dispatcher: this.dispatcher
|
||||||
|
})
|
||||||
const setCookie = resp.headers.get('Set-Cookie') ?? ''
|
const setCookie = resp.headers.get('Set-Cookie') ?? ''
|
||||||
const sid = setCookie.match(/sid=(fr[0-9a-f]+)/)![1]
|
const sid = setCookie.match(/sid=(fr[0-9a-f]+)/)![1]
|
||||||
this.headers['Cookie'] = `sid=${sid}`
|
this.headers['Cookie'] = `sid=${sid}`
|
||||||
@@ -181,7 +192,7 @@ export default class Deezer implements StreamerWithLogin {
|
|||||||
password,
|
password,
|
||||||
hash: this.#md5(CLIENT_ID + username + password + CLIENT_SECRET)
|
hash: this.#md5(CLIENT_ID + username + password + CLIENT_SECRET)
|
||||||
})}`,
|
})}`,
|
||||||
{ headers: this.headers }
|
{ headers: this.headers, dispatcher: this.dispatcher }
|
||||||
)
|
)
|
||||||
const { error } = <DeezerLoginResponse>await loginReq.json()
|
const { error } = <DeezerLoginResponse>await loginReq.json()
|
||||||
|
|
||||||
@@ -242,7 +253,7 @@ export default class Deezer implements StreamerWithLogin {
|
|||||||
/* ---------- GET INFO FROM URL ---------- */
|
/* ---------- GET INFO FROM URL ---------- */
|
||||||
|
|
||||||
async #unshortenUrl(url: URL): Promise<URL> {
|
async #unshortenUrl(url: URL): Promise<URL> {
|
||||||
const res = await fetch(url, { redirect: 'manual' })
|
const res = await fetch(url, { redirect: 'manual', dispatcher: this.dispatcher })
|
||||||
const location = res.headers.get('Location')
|
const location = res.headers.get('Location')
|
||||||
|
|
||||||
if (res.status != 302 || !location) throw new Error('URL not supported')
|
if (res.status != 302 || !location) throw new Error('URL not supported')
|
||||||
@@ -351,7 +362,7 @@ export default class Deezer implements StreamerWithLogin {
|
|||||||
// download
|
// download
|
||||||
|
|
||||||
const url = await this.#getTrackUrl(id, trackToken, trackTokenExpiry, format)
|
const url = await this.#getTrackUrl(id, trackToken, trackTokenExpiry, format)
|
||||||
const streamResp = await fetch(url)
|
const streamResp = await fetch(url, { dispatcher: this.dispatcher })
|
||||||
if (!streamResp.ok)
|
if (!streamResp.ok)
|
||||||
throw new Error(`Failed to get track stream. Status code: ${streamResp.status}`)
|
throw new Error(`Failed to get track stream. Status code: ${streamResp.status}`)
|
||||||
|
|
||||||
@@ -441,7 +452,8 @@ export default class Deezer implements StreamerWithLogin {
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
track_tokens: [trackToken]
|
track_tokens: [trackToken]
|
||||||
})
|
}),
|
||||||
|
dispatcher: this.dispatcher
|
||||||
})
|
})
|
||||||
const res = <DeezerMediaResponse>await req.json()
|
const res = <DeezerMediaResponse>await req.json()
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import crypto from 'crypto'
|
import crypto from 'crypto'
|
||||||
import { fetch } from 'undici'
|
import { fetch, Dispatcher } from 'undici'
|
||||||
import {
|
import {
|
||||||
ItemType,
|
ItemType,
|
||||||
StreamerWithLogin,
|
StreamerWithLogin,
|
||||||
@@ -27,6 +27,7 @@ interface QobuzOptions {
|
|||||||
appSecret: string
|
appSecret: string
|
||||||
appId: string
|
appId: string
|
||||||
token?: string
|
token?: string
|
||||||
|
dispatcher?: Dispatcher
|
||||||
}
|
}
|
||||||
|
|
||||||
interface LoginResponse {
|
interface LoginResponse {
|
||||||
@@ -66,11 +67,13 @@ export default class Qobuz implements StreamerWithLogin {
|
|||||||
token?: string
|
token?: string
|
||||||
appSecret: string
|
appSecret: string
|
||||||
appId: string
|
appId: string
|
||||||
|
dispatcher: Dispatcher | undefined
|
||||||
fetch?(url: URL | RequestInfo, init?: RequestInit): Promise<Response>
|
fetch?(url: URL | RequestInfo, init?: RequestInit): Promise<Response>
|
||||||
constructor(options: QobuzOptions) {
|
constructor(options: QobuzOptions) {
|
||||||
this.appSecret = options.appSecret
|
this.appSecret = options.appSecret
|
||||||
this.appId = options.appId
|
this.appId = options.appId
|
||||||
if (options.token) this.token = options.token
|
if (options.token) this.token = options.token
|
||||||
|
if (options.dispatcher) this.dispatcher = options.dispatcher
|
||||||
}
|
}
|
||||||
|
|
||||||
async #get(url: string, params: { [key: string]: string | number }) {
|
async #get(url: string, params: { [key: string]: string | number }) {
|
||||||
@@ -83,7 +86,8 @@ export default class Qobuz implements StreamerWithLogin {
|
|||||||
)}`,
|
)}`,
|
||||||
{
|
{
|
||||||
method: 'get',
|
method: 'get',
|
||||||
headers: headers(this.token)
|
headers: headers(this.token),
|
||||||
|
dispatcher: this.dispatcher
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -179,7 +183,7 @@ export default class Qobuz implements StreamerWithLogin {
|
|||||||
)
|
)
|
||||||
if (trackFileResponse.sample == true)
|
if (trackFileResponse.sample == true)
|
||||||
throw new Error(`Could not get non-sample file. Make sure the track isn't purchase-only.`)
|
throw new Error(`Could not get non-sample file. Make sure the track isn't purchase-only.`)
|
||||||
const streamResponse = await fetch(trackFileResponse.url)
|
const streamResponse = await fetch(trackFileResponse.url, { dispatcher: this.dispatcher })
|
||||||
return {
|
return {
|
||||||
mimeType: trackFileResponse.mime_type,
|
mimeType: trackFileResponse.mime_type,
|
||||||
sizeBytes: parseInt(<string>streamResponse.headers.get('Content-Length')),
|
sizeBytes: parseInt(<string>streamResponse.headers.get('Content-Length')),
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { fetch, HeadersInit } from 'undici'
|
import { Dispatcher, fetch, HeadersInit } from 'undici'
|
||||||
import { DEFAULT_HEADERS } from './constants.js'
|
import { DEFAULT_HEADERS } from './constants.js'
|
||||||
import {
|
import {
|
||||||
ItemType,
|
ItemType,
|
||||||
@@ -30,6 +30,7 @@ function headers(oauthToken?: string | undefined): HeadersInit {
|
|||||||
|
|
||||||
interface SoundcloudOptions {
|
interface SoundcloudOptions {
|
||||||
oauthToken?: string
|
oauthToken?: string
|
||||||
|
dispatcher: Dispatcher | undefined
|
||||||
}
|
}
|
||||||
|
|
||||||
interface SoundcloudTranscoding {
|
interface SoundcloudTranscoding {
|
||||||
@@ -69,8 +70,10 @@ export default class Soundcloud implements Streamer {
|
|||||||
} as const
|
} as const
|
||||||
oauthToken?: string
|
oauthToken?: string
|
||||||
client?: ScClient
|
client?: ScClient
|
||||||
|
dispatcher: Dispatcher | undefined
|
||||||
constructor(options: SoundcloudOptions) {
|
constructor(options: SoundcloudOptions) {
|
||||||
this.oauthToken = options?.oauthToken
|
this.oauthToken = options?.oauthToken
|
||||||
|
this.dispatcher = options?.dispatcher
|
||||||
}
|
}
|
||||||
async search(query: string, limit = 20): Promise<SearchResults> {
|
async search(query: string, limit = 20): Promise<SearchResults> {
|
||||||
const client = this.client || (await this.#getClient())
|
const client = this.client || (await this.#getClient())
|
||||||
@@ -81,7 +84,7 @@ export default class Soundcloud implements Streamer {
|
|||||||
)}&offset=0&linked_partitioning=1&app_locale=en&limit=${limit}`,
|
)}&offset=0&linked_partitioning=1&app_locale=en&limit=${limit}`,
|
||||||
client
|
client
|
||||||
),
|
),
|
||||||
{ method: 'get', headers: headers(this.oauthToken) }
|
{ method: 'get', headers: headers(this.oauthToken), dispatcher: this.dispatcher }
|
||||||
)
|
)
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
const errMsg = await response.text()
|
const errMsg = await response.text()
|
||||||
@@ -116,7 +119,8 @@ export default class Soundcloud implements Streamer {
|
|||||||
const response = await (
|
const response = await (
|
||||||
await fetch(`https://soundcloud.com/`, {
|
await fetch(`https://soundcloud.com/`, {
|
||||||
method: 'get',
|
method: 'get',
|
||||||
headers: headers()
|
headers: headers(this.oauthToken),
|
||||||
|
dispatcher: this.dispatcher
|
||||||
})
|
})
|
||||||
).text()
|
).text()
|
||||||
|
|
||||||
@@ -163,7 +167,13 @@ export default class Soundcloud implements Streamer {
|
|||||||
url = url.replace('//m.', '//')
|
url = url.replace('//m.', '//')
|
||||||
|
|
||||||
// getting the IDs and track authorization
|
// getting the IDs and track authorization
|
||||||
const html = await (await fetch(url, { method: 'get', headers: headers() })).text()
|
const html = await (
|
||||||
|
await fetch(url, {
|
||||||
|
method: 'get',
|
||||||
|
headers: headers(this.oauthToken),
|
||||||
|
dispatcher: this.dispatcher
|
||||||
|
})
|
||||||
|
).text()
|
||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case 'track': {
|
case 'track': {
|
||||||
@@ -177,7 +187,8 @@ export default class Soundcloud implements Streamer {
|
|||||||
await (
|
await (
|
||||||
await fetch(this.#formatURL(naked, client), {
|
await fetch(this.#formatURL(naked, client), {
|
||||||
method: 'get',
|
method: 'get',
|
||||||
headers: headers(this.oauthToken)
|
headers: headers(this.oauthToken),
|
||||||
|
dispatcher: this.dispatcher
|
||||||
})
|
})
|
||||||
).text()
|
).text()
|
||||||
)
|
)
|
||||||
@@ -248,7 +259,8 @@ export default class Soundcloud implements Streamer {
|
|||||||
await (
|
await (
|
||||||
await fetch(this.#formatURL(`https://api-v2.soundcloud.com/tracks/${id}`, client), {
|
await fetch(this.#formatURL(`https://api-v2.soundcloud.com/tracks/${id}`, client), {
|
||||||
method: 'get',
|
method: 'get',
|
||||||
headers: headers(this.oauthToken)
|
headers: headers(this.oauthToken),
|
||||||
|
dispatcher: this.dispatcher
|
||||||
})
|
})
|
||||||
).text()
|
).text()
|
||||||
)
|
)
|
||||||
@@ -265,7 +277,8 @@ export default class Soundcloud implements Streamer {
|
|||||||
),
|
),
|
||||||
{
|
{
|
||||||
method: 'get',
|
method: 'get',
|
||||||
headers: headers(this.oauthToken)
|
headers: headers(this.oauthToken),
|
||||||
|
dispatcher: this.dispatcher
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
).json()
|
).json()
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { fetch } from 'undici'
|
import { Dispatcher, fetch } from 'undici'
|
||||||
import { spawn } from 'child_process'
|
import { spawn } from 'child_process'
|
||||||
import os from 'node:os'
|
import os from 'node:os'
|
||||||
import fs from 'node:fs'
|
import fs from 'node:fs'
|
||||||
@@ -32,6 +32,7 @@ interface TidalOptions {
|
|||||||
refreshToken: string
|
refreshToken: string
|
||||||
expires: number
|
expires: number
|
||||||
countryCode: string
|
countryCode: string
|
||||||
|
dispatcher?: Dispatcher
|
||||||
}
|
}
|
||||||
|
|
||||||
interface LoginData {
|
interface LoginData {
|
||||||
@@ -71,6 +72,7 @@ export default class Tidal implements Streamer {
|
|||||||
expires: number
|
expires: number
|
||||||
countryCode: string
|
countryCode: string
|
||||||
userId: number | undefined
|
userId: number | undefined
|
||||||
|
dispatcher: Dispatcher | undefined
|
||||||
hostnames = ['tidal.com', 'www.tidal.com', 'listen.tidal.com']
|
hostnames = ['tidal.com', 'www.tidal.com', 'listen.tidal.com']
|
||||||
testData = {
|
testData = {
|
||||||
'https://tidal.com/browse/artist/3908662': {
|
'https://tidal.com/browse/artist/3908662': {
|
||||||
@@ -96,6 +98,7 @@ export default class Tidal implements Streamer {
|
|||||||
this.refreshToken = options.refreshToken
|
this.refreshToken = options.refreshToken
|
||||||
this.expires = options.expires
|
this.expires = options.expires
|
||||||
this.countryCode = options.countryCode
|
this.countryCode = options.countryCode
|
||||||
|
if (options.dispatcher) this.dispatcher = options.dispatcher
|
||||||
|
|
||||||
const getReady = async () => {
|
const getReady = async () => {
|
||||||
if (!this.refreshToken) return
|
if (!this.refreshToken) return
|
||||||
@@ -130,7 +133,8 @@ export default class Tidal implements Streamer {
|
|||||||
const response = await fetch(
|
const response = await fetch(
|
||||||
`${base}${url}?${new URLSearchParams(<{ [key: string]: string }>params)}`,
|
`${base}${url}?${new URLSearchParams(<{ [key: string]: string }>params)}`,
|
||||||
{
|
{
|
||||||
headers: this.headers()
|
headers: this.headers(),
|
||||||
|
dispatcher: this.dispatcher
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -156,13 +160,15 @@ export default class Tidal implements Streamer {
|
|||||||
}
|
}
|
||||||
async sessionValid() {
|
async sessionValid() {
|
||||||
const resp = await fetch('https://api.tidal.com/v1/sessions', {
|
const resp = await fetch('https://api.tidal.com/v1/sessions', {
|
||||||
headers: this.headers()
|
headers: this.headers(),
|
||||||
|
dispatcher: this.dispatcher
|
||||||
})
|
})
|
||||||
return resp.ok
|
return resp.ok
|
||||||
}
|
}
|
||||||
async getCountryCode() {
|
async getCountryCode() {
|
||||||
const sessionResponse = await fetch('https://api.tidal.com/v1/sessions', {
|
const sessionResponse = await fetch('https://api.tidal.com/v1/sessions', {
|
||||||
headers: this.headers()
|
headers: this.headers(),
|
||||||
|
dispatcher: this.dispatcher
|
||||||
})
|
})
|
||||||
if (sessionResponse.status != 200) return false
|
if (sessionResponse.status != 200) return false
|
||||||
const sessionData = <SessionData>await sessionResponse.json()
|
const sessionData = <SessionData>await sessionResponse.json()
|
||||||
@@ -176,7 +182,8 @@ export default class Tidal implements Streamer {
|
|||||||
body: new URLSearchParams({
|
body: new URLSearchParams({
|
||||||
client_id: this.tvToken,
|
client_id: this.tvToken,
|
||||||
scope: 'r_usr w_usr'
|
scope: 'r_usr w_usr'
|
||||||
})
|
}),
|
||||||
|
dispatcher: this.dispatcher
|
||||||
})
|
})
|
||||||
if (deviceAuthResponse.status != 200) throw new Error(`Couldn't authorize Tidal`)
|
if (deviceAuthResponse.status != 200) throw new Error(`Couldn't authorize Tidal`)
|
||||||
interface DeviceAuth {
|
interface DeviceAuth {
|
||||||
@@ -199,7 +206,8 @@ export default class Tidal implements Streamer {
|
|||||||
await new Promise((r) => setTimeout(r, 1000))
|
await new Promise((r) => setTimeout(r, 1000))
|
||||||
const loginResponse = await fetch(`${TIDAL_AUTH_BASE}oauth2/token`, {
|
const loginResponse = await fetch(`${TIDAL_AUTH_BASE}oauth2/token`, {
|
||||||
method: 'post',
|
method: 'post',
|
||||||
body: new URLSearchParams(params)
|
body: new URLSearchParams(params),
|
||||||
|
dispatcher: this.dispatcher
|
||||||
})
|
})
|
||||||
statusCode = loginResponse.status
|
statusCode = loginResponse.status
|
||||||
loginData = <LoginData>await loginResponse.json()
|
loginData = <LoginData>await loginResponse.json()
|
||||||
@@ -235,7 +243,8 @@ export default class Tidal implements Streamer {
|
|||||||
client_id: this.tvToken,
|
client_id: this.tvToken,
|
||||||
client_secret: this.tvSecret,
|
client_secret: this.tvSecret,
|
||||||
grant_type: 'refresh_token'
|
grant_type: 'refresh_token'
|
||||||
})
|
}),
|
||||||
|
dispatcher: this.dispatcher
|
||||||
})
|
})
|
||||||
|
|
||||||
if (refreshResponse.status == 200) {
|
if (refreshResponse.status == 200) {
|
||||||
@@ -350,7 +359,7 @@ export default class Tidal implements Streamer {
|
|||||||
|
|
||||||
if (playbackInfoResponse.manifestMimeType != 'application/dash+xml') {
|
if (playbackInfoResponse.manifestMimeType != 'application/dash+xml') {
|
||||||
const manifest = <Manifest>JSON.parse(manifestStr)
|
const manifest = <Manifest>JSON.parse(manifestStr)
|
||||||
const streamResponse = await fetch(manifest.urls[0])
|
const streamResponse = await fetch(manifest.urls[0], { dispatcher: this.dispatcher })
|
||||||
return {
|
return {
|
||||||
mimeType: manifest.mimeType,
|
mimeType: manifest.mimeType,
|
||||||
sizeBytes: parseInt(<string>streamResponse.headers.get('Content-Length')),
|
sizeBytes: parseInt(<string>streamResponse.headers.get('Content-Length')),
|
||||||
@@ -500,7 +509,8 @@ export default class Tidal implements Streamer {
|
|||||||
if (this.userId == undefined || this.countryCode == undefined) {
|
if (this.userId == undefined || this.countryCode == undefined) {
|
||||||
if (Date.now() > this.expires) await this.refresh()
|
if (Date.now() > this.expires) await this.refresh()
|
||||||
const sessionResponse = await fetch('https://api.tidal.com/v1/sessions', {
|
const sessionResponse = await fetch('https://api.tidal.com/v1/sessions', {
|
||||||
headers: this.headers()
|
headers: this.headers(),
|
||||||
|
dispatcher: this.dispatcher
|
||||||
})
|
})
|
||||||
const sessionData = <SessionData>await sessionResponse.json()
|
const sessionData = <SessionData>await sessionResponse.json()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user