0.8.8
Spotify Revamped + YouTube Error fixes + YouTube Stream improvements
This commit is contained in:
commit
947075afad
@ -15,6 +15,13 @@ This is a **light-weight** youtube downloader and searcher.
|
||||
npm install play-dl@latest
|
||||
```
|
||||
|
||||
### Importing
|
||||
```ts
|
||||
import * as play from 'play-dl' // ES-6 import or TS import
|
||||
|
||||
const play = require('play-dl') //JS importing
|
||||
```
|
||||
|
||||
### Examples
|
||||
- [YouTube](https://github.com/play-dl/play-dl/tree/main/examples/YouTube)
|
||||
- [Spotify](https://github.com/play-dl/play-dl/tree/main/examples/Spotify)
|
||||
|
||||
@ -1,5 +1,88 @@
|
||||
# Spotify
|
||||
|
||||
## Main
|
||||
### spotify(url : `string`)
|
||||
*This returns data from a track | playlist | album url.*
|
||||
|
||||
```js
|
||||
let data = await spotify(url) //Gets the data
|
||||
|
||||
console.log(data.type) // Console logs the type of data that you got.
|
||||
```
|
||||
|
||||
### Authorization()
|
||||
*This creates basic spotify data to be stored locally.*
|
||||
|
||||
```js
|
||||
Authorization() //After then you will be asked client-id, client-secret, redirect url, market, redirected URL.
|
||||
```
|
||||
|
||||
### is_expired()
|
||||
*This tells that whether the access token is expired or not*
|
||||
|
||||
**Returns :** `boolean`
|
||||
|
||||
```js
|
||||
if(is_expired()){
|
||||
await RefreshToken()
|
||||
}
|
||||
```
|
||||
|
||||
### RefreshToken()
|
||||
*This refreshes the access token.*
|
||||
|
||||
**Returns :** `boolean` for telling whether access token is refreshed or not
|
||||
|
||||
```js
|
||||
await RefreshToken()
|
||||
```
|
||||
|
||||
## Classes [ Returned by spotify() function ]
|
||||
### SpotifyVideo
|
||||
*Don't go by the name. This is class for a spotify track.*
|
||||
|
||||
#### type `property`
|
||||
*This will always return as "track" for this class.*
|
||||
|
||||
#### toJSON() `function`
|
||||
*converts class into a json format*
|
||||
|
||||
### SpotifyPlaylist
|
||||
*This is a spotify playlist class.*
|
||||
|
||||
#### fetch() `function`
|
||||
*This will fetch tracks in a playlist upto 1000 tracks only.*
|
||||
|
||||
```js
|
||||
let data = await spotify(playlist_url)
|
||||
|
||||
await data.fetch() // Fetches tracks more than 100 tracks in playlist
|
||||
```
|
||||
|
||||
#### type `property`
|
||||
*This will always return as "playlist" for this class.*
|
||||
|
||||
#### toJSON() `function`
|
||||
*converts class into a json format*
|
||||
|
||||
### SpotifyAlbum
|
||||
*This is a spotify albun class.*
|
||||
|
||||
#### fetch() `function`
|
||||
*This will fetch tracks in a album upto 500 tracks only.*
|
||||
|
||||
```js
|
||||
let data = await spotify(playlist_url)
|
||||
|
||||
await data.fetch() // Fetches tracks more than 50 tracks in album
|
||||
```
|
||||
|
||||
#### type `property`
|
||||
*This will always return as "album" for this class.*
|
||||
|
||||
#### toJSON() `function`
|
||||
*converts class into a json format*
|
||||
|
||||
## Validate
|
||||
### sp_validate(url : `string`)
|
||||
*This checks that given url is spotify url or not.*
|
||||
@ -11,14 +94,4 @@ let check = sp_validate(url)
|
||||
if(!check) // Invalid Spotify URL
|
||||
|
||||
if(check === 'track') // Spotify Track URL
|
||||
```
|
||||
|
||||
## Main
|
||||
### spotify(url : `string`)
|
||||
*This returns data from a track | playlist | album url.*
|
||||
|
||||
```js
|
||||
let data = spotify(url) //Gets the data
|
||||
|
||||
console.log(data.type) // Console logs the type of data that you got.
|
||||
```
|
||||
3
examples/Spotify/authorize.js
Normal file
3
examples/Spotify/authorize.js
Normal file
@ -0,0 +1,3 @@
|
||||
const { Authorization } = require('play-dl');
|
||||
|
||||
Authorization()
|
||||
@ -14,7 +14,9 @@ client.on('messageCreate', async message => {
|
||||
guildId : message.guild.id,
|
||||
adapterCreator: message.guild.voiceAdapterCreator
|
||||
})
|
||||
|
||||
if(play.is_expired()){
|
||||
await play.RefreshToken() // This will check if access token has expired or not. If yes, then refresh the token.
|
||||
}
|
||||
let args = message.content.split('play ')[1].split(' ')[0]
|
||||
let sp_data = await play.spotify(args) // This will get spotify data from the url [ I used track url, make sure to make a logic for playlist, album ]
|
||||
let searched = await play.search(`${sp_data.name}`, { limit : 1 }) // This will search the found track on youtube.
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
import got, { Response } from "got/dist/source";
|
||||
import { SpotifyDataOptions } from ".";
|
||||
|
||||
|
||||
interface SpotifyTrackAlbum{
|
||||
@ -90,8 +92,10 @@ export class SpotifyPlaylist{
|
||||
id : string;
|
||||
thumbnail : SpotifyThumbnail;
|
||||
owner : SpotifyArtists;
|
||||
tracks : SpotifyVideo[]
|
||||
constructor(data : any){
|
||||
tracksCount : number;
|
||||
private spotifyData : SpotifyDataOptions;
|
||||
private fetched_tracks : Map<string, SpotifyVideo[]>
|
||||
constructor(data : any, spotifyData : SpotifyDataOptions){
|
||||
this.name = data.name
|
||||
this.type = "playlist"
|
||||
this.collaborative = data.collaborative
|
||||
@ -104,11 +108,56 @@ export class SpotifyPlaylist{
|
||||
url : data.owner.external_urls.spotify,
|
||||
id : data.owner.id
|
||||
}
|
||||
this.tracksCount = Number(data.tracks.total)
|
||||
let videos: SpotifyVideo[] = []
|
||||
data.tracks.items.forEach((v : any) => {
|
||||
videos.push(new SpotifyVideo(v.track))
|
||||
})
|
||||
this.tracks = videos
|
||||
this.fetched_tracks = new Map()
|
||||
this.fetched_tracks.set('1', videos)
|
||||
this.spotifyData = spotifyData
|
||||
}
|
||||
|
||||
async fetch(){
|
||||
let fetching : number;
|
||||
if(this.tracksCount > 1000) fetching = 1000
|
||||
else fetching = this.tracksCount
|
||||
if(fetching <= 100) return
|
||||
let work = []
|
||||
for(let i = 2; i <= Math.ceil(fetching/100); i++){
|
||||
work.push(new Promise(async (resolve, reject) => {
|
||||
let response = await got(`https://api.spotify.com/v1/playlists/${this.id}/tracks?offset=${(i-1)*100}&limit=100&market=${this.spotifyData.market}`, {
|
||||
headers : {
|
||||
"Authorization" : `${this.spotifyData.token_type} ${this.spotifyData.access_token}`
|
||||
}
|
||||
}).catch((err) => reject(`Response Error : \n${err}`))
|
||||
let videos: SpotifyVideo[] = []
|
||||
let res = response as Response<string>
|
||||
let json_data = JSON.parse(res.body)
|
||||
json_data.items.forEach((v : any) => {
|
||||
videos.push(new SpotifyVideo(v.track))
|
||||
})
|
||||
this.fetched_tracks.set(`${i}`, videos)
|
||||
resolve('Success')
|
||||
}))
|
||||
}
|
||||
await Promise.allSettled(work)
|
||||
return this
|
||||
}
|
||||
|
||||
page(num : number){
|
||||
if(!num) throw new Error('Page number is not provided')
|
||||
if(!this.fetched_tracks.has(`${num}`)) throw new Error('Given Page number is invalid')
|
||||
return this.fetched_tracks.get(`${num}`)
|
||||
}
|
||||
|
||||
get total_pages(){
|
||||
return this.fetched_tracks.size
|
||||
}
|
||||
|
||||
get total_tracks(){
|
||||
let page_number: number = this.total_pages
|
||||
return (page_number - 1) * 100 + (this.fetched_tracks.get(`page${page_number}`) as SpotifyVideo[]).length
|
||||
}
|
||||
|
||||
toJSON(){
|
||||
@ -121,7 +170,6 @@ export class SpotifyPlaylist{
|
||||
id : this.id,
|
||||
thumbnail : this.thumbnail,
|
||||
owner : this.owner,
|
||||
tracks : this.tracks
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -130,16 +178,19 @@ export class SpotifyAlbum{
|
||||
name : string
|
||||
type : "track" | "playlist" | "album"
|
||||
url : string
|
||||
id : string;
|
||||
thumbnail : SpotifyThumbnail
|
||||
artists : SpotifyArtists[]
|
||||
copyrights : SpotifyCopyright[]
|
||||
release_date : string;
|
||||
release_date_precision : string;
|
||||
total_tracks : number
|
||||
tracks : SpotifyTracks[]
|
||||
constructor(data : any){
|
||||
trackCount : number
|
||||
private spotifyData : SpotifyDataOptions;
|
||||
private fetched_tracks : Map<string, SpotifyTracks[]>
|
||||
constructor(data : any, spotifyData : SpotifyDataOptions){
|
||||
this.name = data.name
|
||||
this.type = "album"
|
||||
this.id = data.id
|
||||
this.url = data.external_urls.spotify
|
||||
this.thumbnail = data.images[0]
|
||||
let artists : SpotifyArtists[] = []
|
||||
@ -154,12 +205,56 @@ export class SpotifyAlbum{
|
||||
this.copyrights = data.copyrights
|
||||
this.release_date = data.release_date
|
||||
this.release_date_precision = data.release_date_precision
|
||||
this.total_tracks = data.total_tracks
|
||||
this.trackCount = data.total_tracks
|
||||
let videos: SpotifyTracks[] = []
|
||||
data.tracks.items.forEach((v : any) => {
|
||||
videos.push(new SpotifyTracks(v))
|
||||
})
|
||||
this.tracks = videos
|
||||
this.fetched_tracks = new Map()
|
||||
this.fetched_tracks.set('1', videos)
|
||||
this.spotifyData = spotifyData
|
||||
}
|
||||
|
||||
async fetch(){
|
||||
let fetching : number;
|
||||
if(this.trackCount > 500) fetching = 500
|
||||
else fetching = this.trackCount
|
||||
if(fetching <= 50) return
|
||||
let work = []
|
||||
for(let i = 2; i <= Math.ceil(fetching/50); i++){
|
||||
work.push(new Promise(async (resolve, reject) => {
|
||||
let response = await got(`https://api.spotify.com/v1/albums/${this.id}/tracks?offset=${(i-1)*50}&limit=50&market=${this.spotifyData.market}`, {
|
||||
headers : {
|
||||
"Authorization" : `${this.spotifyData.token_type} ${this.spotifyData.access_token}`
|
||||
}
|
||||
}).catch((err) => reject(`Response Error : \n${err}`))
|
||||
let videos: SpotifyTracks[] = []
|
||||
let res = response as Response<string>
|
||||
let json_data = JSON.parse(res.body)
|
||||
json_data.items.forEach((v : any) => {
|
||||
videos.push(new SpotifyTracks(v))
|
||||
})
|
||||
this.fetched_tracks.set(`${i}`, videos)
|
||||
resolve('Success')
|
||||
}))
|
||||
}
|
||||
await Promise.allSettled(work)
|
||||
return this
|
||||
}
|
||||
|
||||
page(num : number){
|
||||
if(!num) throw new Error('Page number is not provided')
|
||||
if(!this.fetched_tracks.has(`${num}`)) throw new Error('Given Page number is invalid')
|
||||
return this.fetched_tracks.get(`${num}`)
|
||||
}
|
||||
|
||||
get total_pages(){
|
||||
return this.fetched_tracks.size
|
||||
}
|
||||
|
||||
get total_tracks(){
|
||||
let page_number: number = this.total_pages
|
||||
return (page_number - 1) * 100 + (this.fetched_tracks.get(`page${page_number}`) as SpotifyVideo[]).length
|
||||
}
|
||||
|
||||
toJSON(){
|
||||
@ -173,7 +268,6 @@ export class SpotifyAlbum{
|
||||
release_date : this.release_date,
|
||||
release_date_precision : this.release_date_precision,
|
||||
total_tracks : this.total_tracks,
|
||||
tracks : this.tracks
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,44 +1,62 @@
|
||||
import got from "got/dist/source"
|
||||
import { SpotifyAlbum, SpotifyPlaylist, SpotifyVideo } from "./classes"
|
||||
import readline from 'readline'
|
||||
import fs from 'fs'
|
||||
|
||||
var spotifyData : SpotifyDataOptions;
|
||||
if(fs.existsSync('.data/spotify.data')){
|
||||
spotifyData = JSON.parse(fs.readFileSync('.data/spotify.data').toString())
|
||||
}
|
||||
|
||||
export interface SpotifyDataOptions{
|
||||
client_id : string;
|
||||
client_secret : string;
|
||||
redirect_url : string;
|
||||
authorization_code? :string;
|
||||
access_token? : string;
|
||||
refresh_token? : string;
|
||||
token_type? : string;
|
||||
expires_in? : number;
|
||||
expiry? : number;
|
||||
market? : string;
|
||||
}
|
||||
|
||||
const pattern = /^((https:)?\/\/)?open.spotify.com\/(track|album|playlist)\//
|
||||
|
||||
export async function spotify(url : string): Promise<SpotifyAlbum | SpotifyPlaylist | SpotifyVideo>{
|
||||
if(!spotifyData) throw new Error('Spotify Data is missing\nDid you forgot to do authorization ?')
|
||||
if(!url.match(pattern)) throw new Error('This is not a Spotify URL')
|
||||
let embed = embed_url(url)
|
||||
let response = await got(embed)
|
||||
return parse_json(embed, response.body)
|
||||
}
|
||||
|
||||
function parse_json(url : string, data : string): SpotifyAlbum | SpotifyPlaylist | SpotifyVideo{
|
||||
let json_data = JSON.parse(decodeURIComponent(data.split('<script id="resource" type="application/json">')[1].split('</script>')[0]))
|
||||
if(url.indexOf('track') !== -1){
|
||||
return new SpotifyVideo(json_data)
|
||||
}
|
||||
else if(url.indexOf('album') !== -1){
|
||||
return new SpotifyAlbum(json_data)
|
||||
}
|
||||
else if(url.indexOf('playlist') !== -1){
|
||||
return new SpotifyPlaylist(json_data)
|
||||
}
|
||||
else throw new Error('Failed to parse data')
|
||||
}
|
||||
|
||||
function embed_url(url : string): string{
|
||||
if(url.indexOf('track/') !== -1){
|
||||
let trackID = url.split('track/')[1].split('?')[0].split('/')[0].split('&')[0]
|
||||
return `https://open.spotify.com/embed/track/${trackID}`
|
||||
let trackID = url.split('track/')[1].split('&')[0].split('?')[0]
|
||||
let response = await got(`https://api.spotify.com/v1/tracks/${trackID}?market=${spotifyData.market}`, {
|
||||
headers : {
|
||||
"Authorization" : `${spotifyData.token_type} ${spotifyData.access_token}`
|
||||
}
|
||||
}).catch((err) => {return 0})
|
||||
if(typeof response !== 'number') return new SpotifyVideo(JSON.parse(response.body))
|
||||
else throw new Error('Failed to get spotify Track Data')
|
||||
}
|
||||
else if(url.indexOf('album/') !== -1){
|
||||
let albumID = url.split('album/')[1].split('?')[0].split('/')[0].split('&')[0]
|
||||
return `https://open.spotify.com/embed/album/${albumID}`
|
||||
let albumID = url.split('album/')[1].split('&')[0].split('?')[0]
|
||||
let response = await got(`https://api.spotify.com/v1/albums/${albumID}?market=${spotifyData.market}`, {
|
||||
headers : {
|
||||
"Authorization" : `${spotifyData.token_type} ${spotifyData.access_token}`
|
||||
}
|
||||
}).catch((err) => {return 0})
|
||||
if(typeof response !== 'number') return new SpotifyAlbum(JSON.parse(response.body), spotifyData)
|
||||
else throw new Error('Failed to get spotify Album Data')
|
||||
}
|
||||
else if(url.indexOf('playlist/') !== -1){
|
||||
let playlistID = url.split('playlist/')[1].split('?')[0].split('/')[0].split('&')[0]
|
||||
return `https://open.spotify.com/embed/playlist/${playlistID}`
|
||||
let playlistID = url.split('playlist/')[1].split('&')[0].split('?')[0]
|
||||
let response = await got(`https://api.spotify.com/v1/playlists/${playlistID}?market=${spotifyData.market}`, {
|
||||
headers : {
|
||||
"Authorization" : `${spotifyData.token_type} ${spotifyData.access_token}`
|
||||
}
|
||||
}).catch((err) => {return 0})
|
||||
if(typeof response !== 'number') return new SpotifyPlaylist(JSON.parse(response.body), spotifyData)
|
||||
else throw new Error('Failed to get spotify Playlist Data')
|
||||
}
|
||||
else throw new Error('Unable to generate embed url for given spotify url.')
|
||||
else throw new Error('URL is out of scope for play-dl.')
|
||||
}
|
||||
|
||||
export function sp_validate(url : string): "track" | "playlist" | "album" | boolean{
|
||||
@ -53,4 +71,104 @@ export function sp_validate(url : string): "track" | "playlist" | "album" | bool
|
||||
return "playlist"
|
||||
}
|
||||
else return false
|
||||
}
|
||||
|
||||
export function Authorization(){
|
||||
let ask = readline.createInterface({
|
||||
input : process.stdin,
|
||||
output : process.stdout
|
||||
})
|
||||
|
||||
let client_id : string, client_secret : string, redirect_url : string, market : string;
|
||||
ask.question('Client ID : ', (id) => {
|
||||
client_id = id
|
||||
ask.question('Client Secret : ', (secret) => {
|
||||
client_secret = secret
|
||||
ask.question('Redirect URL : ', (url) => {
|
||||
redirect_url = url
|
||||
console.log('\nMarket Selection URL : \nhttps://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements \n')
|
||||
ask.question('Market : ', (mar) => {
|
||||
if(mar.length === 2) market = mar
|
||||
else {
|
||||
console.log('Invalid Market, Selecting IN as market')
|
||||
market = 'IN'
|
||||
}
|
||||
console.log('\nNow Go to your browser and Paste this url. Authroize it and paste the redirected url here. \n')
|
||||
console.log(`https://accounts.spotify.com/authorize?client_id=${client_id}&response_type=code&redirect_uri=${encodeURI(redirect_url)} \n`)
|
||||
ask.question('Redirected URL : ',async (url) => {
|
||||
if (!fs.existsSync('.data')) fs.mkdirSync('.data')
|
||||
spotifyData = {
|
||||
client_id,
|
||||
client_secret,
|
||||
redirect_url,
|
||||
authorization_code : url.split('code=')[1],
|
||||
market
|
||||
}
|
||||
let check = await SpotifyAuthorize(spotifyData)
|
||||
if(check === false) throw new Error('Failed to get access Token.')
|
||||
ask.close()
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
async function SpotifyAuthorize(data : SpotifyDataOptions): Promise<boolean>{
|
||||
let response = await got.post(`https://accounts.spotify.com/api/token?grant_type=authorization_code&code=${data.authorization_code}&redirect_uri=${encodeURI(data.redirect_url)}`, {
|
||||
headers : {
|
||||
"Authorization" : `Basic ${Buffer.from(`${data.client_id}:${data.client_secret}`).toString('base64')}`,
|
||||
"Content-Type" : "application/x-www-form-urlencoded"
|
||||
}
|
||||
}).catch(() => {
|
||||
return 0
|
||||
})
|
||||
|
||||
if(typeof response === 'number') return false
|
||||
let resp_json = JSON.parse(response.body)
|
||||
spotifyData = {
|
||||
client_id : data.client_id,
|
||||
client_secret : data.client_secret,
|
||||
redirect_url : data.redirect_url,
|
||||
access_token : resp_json.access_token,
|
||||
refresh_token : resp_json.refresh_token,
|
||||
expires_in : Number(resp_json.expires_in),
|
||||
expiry : Date.now() + (Number(resp_json.expires_in) * 1000),
|
||||
token_type : resp_json.token_type,
|
||||
market : data.market
|
||||
}
|
||||
fs.writeFileSync('.data/spotify.data', JSON.stringify(spotifyData, undefined, 4))
|
||||
return true
|
||||
}
|
||||
|
||||
export function is_expired(){
|
||||
if(Date.now() >= (spotifyData.expiry as number)) return true
|
||||
else return false
|
||||
}
|
||||
|
||||
export async function RefreshToken(): Promise<true | false>{
|
||||
let response = await got.post(`https://accounts.spotify.com/api/token?grant_type=refresh_token&refresh_token=${spotifyData.refresh_token}`, {
|
||||
headers : {
|
||||
"Authorization" : `Basic ${Buffer.from(`${spotifyData.client_id}:${spotifyData.client_secret}`).toString('base64')}`,
|
||||
"Content-Type" : "application/x-www-form-urlencoded"
|
||||
}
|
||||
}).catch(() => {
|
||||
return 0
|
||||
})
|
||||
|
||||
if(typeof response === 'number') return false
|
||||
let resp_json = JSON.parse(response.body)
|
||||
spotifyData = {
|
||||
client_id : spotifyData.client_id,
|
||||
client_secret : spotifyData.client_secret,
|
||||
redirect_url : spotifyData.redirect_url,
|
||||
access_token : resp_json.access_token,
|
||||
refresh_token : spotifyData.refresh_token,
|
||||
expires_in : Number(resp_json.expires_in),
|
||||
expiry : Date.now() + (Number(resp_json.expires_in) * 1000),
|
||||
token_type : resp_json.token_type,
|
||||
market : spotifyData.market
|
||||
}
|
||||
fs.writeFileSync('.data/spotify.data', JSON.stringify(spotifyData, undefined, 4))
|
||||
return true
|
||||
}
|
||||
@ -115,7 +115,7 @@ export class Stream {
|
||||
private url : string
|
||||
private bytes_count : number;
|
||||
private per_sec_bytes : number;
|
||||
private timer : NodeJS.Timer | null
|
||||
private content_length : number
|
||||
private request : Request | null
|
||||
constructor(url : string, type : StreamType, duration : number, contentLength : number){
|
||||
this.url = url
|
||||
@ -123,7 +123,7 @@ export class Stream {
|
||||
this.stream = new PassThrough({ highWaterMark : 10 * 1000 * 1000 })
|
||||
this.bytes_count = 0
|
||||
this.per_sec_bytes = Math.ceil(contentLength / duration)
|
||||
this.timer = null
|
||||
this.content_length = contentLength
|
||||
this.request = null
|
||||
this.stream.on('close', () => {
|
||||
this.cleanup()
|
||||
@ -132,13 +132,12 @@ export class Stream {
|
||||
}
|
||||
|
||||
private cleanup(){
|
||||
clearTimeout(this.timer as NodeJS.Timer)
|
||||
this.request?.unpipe(this.stream)
|
||||
this.request?.destroy()
|
||||
this.request = null
|
||||
this.timer = null
|
||||
this.url = ''
|
||||
this.bytes_count = 0
|
||||
this.per_sec_bytes = 0
|
||||
}
|
||||
|
||||
private loop(){
|
||||
@ -146,10 +145,10 @@ export class Stream {
|
||||
this.cleanup()
|
||||
return
|
||||
}
|
||||
let absolute_bytes : number = 0
|
||||
let end : number = this.bytes_count + this.per_sec_bytes * 300;
|
||||
let stream = got.stream(this.url, {
|
||||
headers : {
|
||||
"range" : `bytes=${this.bytes_count}-`
|
||||
"range" : `bytes=${this.bytes_count}-${end >= this.content_length ? '' : end}`
|
||||
}
|
||||
})
|
||||
this.request = stream
|
||||
@ -160,20 +159,12 @@ export class Stream {
|
||||
})
|
||||
|
||||
stream.on('data', (chunk: any) => {
|
||||
absolute_bytes += chunk.length
|
||||
this.bytes_count += chunk.length
|
||||
if(absolute_bytes > (this.per_sec_bytes * 300)){
|
||||
stream.destroy()
|
||||
}
|
||||
})
|
||||
|
||||
stream.on('end', () => {
|
||||
this.cleanup()
|
||||
if(end < this.content_length) this.loop()
|
||||
else this.cleanup()
|
||||
})
|
||||
|
||||
this.timer = setTimeout(() => {
|
||||
this.request?.unpipe(this.stream)
|
||||
this.loop()
|
||||
}, 280 * 1000)
|
||||
}
|
||||
}
|
||||
|
||||
@ -109,7 +109,7 @@ export class PlayList{
|
||||
}
|
||||
|
||||
page(number : number): Video[]{
|
||||
if(!number) throw new Error('Given Page number is not provided')
|
||||
if(!number) throw new Error('Page number is not provided')
|
||||
if(!this.fetched_videos.has(`page${number}`)) throw new Error('Given Page number is invalid')
|
||||
return this.fetched_videos.get(`page${number}`) as Video[]
|
||||
}
|
||||
|
||||
@ -13,6 +13,7 @@ enum SearchType {
|
||||
|
||||
export async function search(search :string, options? : ParseSearchInterface): Promise<(Video | Channel | PlayList)[]> {
|
||||
let url = 'https://www.youtube.com/results?search_query=' + search.replaceAll(' ', '+')
|
||||
if(!options || options.type) options = { type : "video" }
|
||||
if(!url.match('&sp=')){
|
||||
url += '&sp='
|
||||
switch(options?.type){
|
||||
@ -27,7 +28,9 @@ export async function search(search :string, options? : ParseSearchInterface): P
|
||||
break
|
||||
}
|
||||
}
|
||||
let body = await url_get(url)
|
||||
let body = await url_get(url, {
|
||||
headers : {'accept-language' : 'en-US,en-IN;q=0.9,en;q=0.8,hi;q=0.7'}
|
||||
})
|
||||
let data = ParseSearchResult(body, options)
|
||||
return data
|
||||
}
|
||||
@ -47,12 +47,12 @@ export async function video_basic_info(url : string, cookie? : string){
|
||||
else video_id = url
|
||||
let new_url = `https://www.youtube.com/watch?v=${video_id}`
|
||||
let body = await url_get(new_url, {
|
||||
headers : (cookie) ? { 'cookie' : cookie } : {}
|
||||
headers : (cookie) ? { 'cookie' : cookie, 'accept-language' : 'en-US,en-IN;q=0.9,en;q=0.8,hi;q=0.7' } : {'accept-language' : 'en-US,en-IN;q=0.9,en;q=0.8,hi;q=0.7'}
|
||||
})
|
||||
let player_response = JSON.parse(body.split("var ytInitialPlayerResponse = ")[1].split("}};")[0] + '}}')
|
||||
let initial_response = JSON.parse(body.split("var ytInitialData = ")[1].split("}};")[0] + '}}')
|
||||
let badge = initial_response.contents.twoColumnWatchNextResults.results.results.contents[1]?.videoSecondaryInfoRenderer?.owner?.videoOwnerRenderer?.badges && initial_response.contents.twoColumnWatchNextResults.results.results.contents[1]?.videoSecondaryInfoRenderer?.owner?.videoOwnerRenderer?.badges[0]
|
||||
if(player_response.playabilityStatus.status !== 'OK') throw new Error(`While getting info from url\n${player_response.playabilityStatus.reason || player_response.playabilityStatus.messages[0]}`)
|
||||
if(player_response.playabilityStatus.status !== 'OK') throw new Error(`While getting info from url\n${player_response.playabilityStatus.errorScreen.playerErrorMessageRenderer?.reason.simpleText ?? player_response.playabilityStatus.errorScreen.playerKavRenderer?.reason.simpleText}`)
|
||||
let html5player = `https://www.youtube.com${body.split('"jsUrl":"')[1].split('"')[0]}`
|
||||
let format = []
|
||||
let vid = player_response.videoDetails
|
||||
@ -129,7 +129,9 @@ export async function playlist_info(url : string, parseIncomplete : boolean = fa
|
||||
else Playlist_id = url
|
||||
let new_url = `https://www.youtube.com/playlist?list=${Playlist_id}`
|
||||
|
||||
let body = await url_get(new_url)
|
||||
let body = await url_get(new_url, {
|
||||
headers : {'accept-language' : 'en-US,en-IN;q=0.9,en;q=0.8,hi;q=0.7'}
|
||||
})
|
||||
let response = JSON.parse(body.split("var ytInitialData = ")[1].split(";</script>")[0])
|
||||
if(response.alerts){
|
||||
if(response.alerts[0].alertWithButtonRenderer?.type === 'INFO') {
|
||||
|
||||
@ -3,7 +3,7 @@ import { PlayList } from "../classes/Playlist";
|
||||
import { Channel } from "../classes/Channel";
|
||||
|
||||
export interface ParseSearchInterface {
|
||||
type?: "video" | "playlist" | "channel" | "all";
|
||||
type?: "video" | "playlist" | "channel" ;
|
||||
limit?: number;
|
||||
}
|
||||
|
||||
@ -13,73 +13,35 @@ export interface thumbnail{
|
||||
url : string
|
||||
}
|
||||
|
||||
export function ParseSearchResult(html :string, options? : ParseSearchInterface): (Video | PlayList | Channel)[] {
|
||||
export function ParseSearchResult(html : string, options? : ParseSearchInterface): (Video | PlayList | Channel)[] {
|
||||
if(!html) throw new Error('Can\'t parse Search result without data')
|
||||
if (!options) options = { type: "video", limit: 0 };
|
||||
if (!options.type) options.type = "video";
|
||||
|
||||
let data = html.split("var ytInitialData = ")[1].split("}};")[0] + '}}';
|
||||
let json_data = JSON.parse(data)
|
||||
let results = []
|
||||
let details = []
|
||||
let fetched = false;
|
||||
|
||||
try {
|
||||
let data = html.split("ytInitialData = JSON.parse('")[1].split("');</script>")[0];
|
||||
html = data.replace(/\\x([0-9A-F]{2})/gi, (...items) => {
|
||||
return String.fromCharCode(parseInt(items[1], 16));
|
||||
});
|
||||
} catch {
|
||||
/* do nothing */
|
||||
}
|
||||
|
||||
try {
|
||||
details = JSON.parse(html.split('{"itemSectionRenderer":{"contents":')[html.split('{"itemSectionRenderer":{"contents":').length - 1].split(',"continuations":[{')[0]);
|
||||
fetched = true;
|
||||
} catch {
|
||||
/* Do nothing*/
|
||||
}
|
||||
|
||||
if (!fetched) {
|
||||
try {
|
||||
details = JSON.parse(html.split('{"itemSectionRenderer":')[html.split('{"itemSectionRenderer":').length - 1].split('},{"continuationItemRenderer":{')[0]).contents;
|
||||
fetched = true;
|
||||
} catch {
|
||||
/* do nothing */
|
||||
}
|
||||
}
|
||||
|
||||
if (!fetched) throw new Error('Failed to Fetch the data')
|
||||
|
||||
for (let i = 0; i < details.length; i++) {
|
||||
let details = json_data.contents.twoColumnSearchResultsRenderer.primaryContents.sectionListRenderer.contents[0].itemSectionRenderer.contents
|
||||
for(let i = 0; i < details.length; i++){
|
||||
if (typeof options.limit === "number" && options.limit > 0 && results.length >= options.limit) break;
|
||||
let data = details[i];
|
||||
let res;
|
||||
if (options.type === "all") {
|
||||
if (!!data.videoRenderer) options.type = "video";
|
||||
else if (!!data.channelRenderer) options.type = "channel";
|
||||
else if (!!data.playlistRenderer) options.type = "playlist";
|
||||
else continue;
|
||||
}
|
||||
|
||||
if (options.type === "video") {
|
||||
const parsed = parseVideo(data);
|
||||
const parsed = parseVideo(details[i]);
|
||||
if (!parsed) continue;
|
||||
res = parsed;
|
||||
results.push(parsed)
|
||||
} else if (options.type === "channel") {
|
||||
const parsed = parseChannel(data);
|
||||
const parsed = parseChannel(details[i]);
|
||||
if (!parsed) continue;
|
||||
res = parsed;
|
||||
results.push(parsed)
|
||||
} else if (options.type === "playlist") {
|
||||
const parsed = parsePlaylist(data);
|
||||
const parsed = parsePlaylist(details[i]);
|
||||
if (!parsed) continue;
|
||||
res = parsed;
|
||||
results.push(parsed)
|
||||
}
|
||||
|
||||
results.push(res);
|
||||
}
|
||||
|
||||
return results as (Video | Channel | PlayList)[];
|
||||
return results
|
||||
}
|
||||
|
||||
|
||||
function parseDuration(duration: string): number {
|
||||
duration ??= "0:00";
|
||||
const args = duration.split(":");
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
export { playlist_info, video_basic_info, video_info, search, stream, stream_from_info, yt_validate, extractID } from "./YouTube";
|
||||
|
||||
export { spotify, sp_validate } from './Spotify'
|
||||
export { spotify, sp_validate, Authorization, RefreshToken, is_expired } from './Spotify'
|
||||
|
||||
import { sp_validate, yt_validate } from ".";
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user