Some improvements in stream
Improve parameter of Stream
This commit is contained in:
commit
dd10155058
@ -52,11 +52,16 @@ let id = extractID(url)
|
|||||||
}) // This creates resource for playing
|
}) // This creates resource for playing
|
||||||
```
|
```
|
||||||
|
|
||||||
### stream_from_info(info : `infoData`)
|
### stream_from_info(info : `infoData`, cookie? : `string`)
|
||||||
*This is basic to create a youtube stream from a info [ from [video_info](https://github.com/play-dl/play-dl#video_infourl--string) function ].*
|
*This is basic to create a youtube stream from a info [ from [video_info](https://github.com/play-dl/play-dl#video_infourl--string) function ].*
|
||||||
|
|
||||||
|
**[Cookies](https://github.com/play-dl/play-dl/discussions/34) are optional and are required for playing age restricted videos.**
|
||||||
|
|
||||||
|
**Note :** cookies are required for retrying purposes.
|
||||||
```js
|
```js
|
||||||
let info = await video_info("url")
|
let info = await video_info("url")
|
||||||
let source = await stream_from_info(info) // This will create a stream Class which contains type and stream to be played.
|
let source = await stream_from_info(info) // This will create a stream Class which contains type and stream to be played.
|
||||||
|
let source = await stream_from_info(info, cookie) // This will create a stream Class which contains type and stream to be played and also give cookies if retrying.
|
||||||
let resource = createAudioResource(source.stream, {
|
let resource = createAudioResource(source.stream, {
|
||||||
inputType : source.type
|
inputType : source.type
|
||||||
}) // This creates resource for playing
|
}) // This creates resource for playing
|
||||||
|
|||||||
@ -17,17 +17,13 @@ client.on('messageCreate', async message => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
let args = message.content.split('play ')[1].split(' ')[0]
|
let args = message.content.split('play ')[1].split(' ')[0]
|
||||||
let stream = await play.stream(args, {
|
let stream = await play.stream(args, COOKIE)
|
||||||
cookie : COOKIE
|
|
||||||
})
|
|
||||||
/*
|
/*
|
||||||
OR if you want to get info about youtube link and then stream it
|
OR if you want to get info about youtube link and then stream it
|
||||||
|
|
||||||
let yt_info = await play.video_info(args, {
|
let yt_info = await play.video_info(args, COOKIE)
|
||||||
cookie : COOKIE
|
|
||||||
})
|
|
||||||
console.log(yt_info.video_details.title)
|
console.log(yt_info.video_details.title)
|
||||||
let stream = await play.stream_from_info(yt_info)
|
let stream = await play.stream_from_info(yt_info, COOKIE)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
let resource = createAudioResource(stream.stream, {
|
let resource = createAudioResource(stream.stream, {
|
||||||
|
|||||||
@ -115,21 +115,19 @@ export class Stream {
|
|||||||
private url : string
|
private url : string
|
||||||
private bytes_count : number;
|
private bytes_count : number;
|
||||||
private per_sec_bytes : number;
|
private per_sec_bytes : number;
|
||||||
private duration : number;
|
|
||||||
private timer : NodeJS.Timer | null
|
private timer : NodeJS.Timer | null
|
||||||
private request : Request | null
|
private request : Request | null
|
||||||
constructor(url : string, type : StreamType, duration : number){
|
constructor(url : string, type : StreamType, duration : number, contentLength : number){
|
||||||
this.url = url
|
this.url = url
|
||||||
this.type = type
|
this.type = type
|
||||||
this.stream = new PassThrough({ highWaterMark : 10 * 1000 * 1000 })
|
this.stream = new PassThrough({ highWaterMark : 10 * 1000 * 1000 })
|
||||||
this.bytes_count = 0
|
this.bytes_count = 0
|
||||||
this.per_sec_bytes = 0
|
this.per_sec_bytes = Math.ceil(contentLength / duration)
|
||||||
this.timer = null
|
this.timer = null
|
||||||
this.request = null
|
this.request = null
|
||||||
this.stream.on('close', () => {
|
this.stream.on('close', () => {
|
||||||
this.cleanup()
|
this.cleanup()
|
||||||
})
|
})
|
||||||
this.duration = duration
|
|
||||||
this.loop()
|
this.loop()
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -141,7 +139,6 @@ export class Stream {
|
|||||||
this.timer = null
|
this.timer = null
|
||||||
this.url = ''
|
this.url = ''
|
||||||
this.bytes_count = 0
|
this.bytes_count = 0
|
||||||
this.per_sec_bytes = 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private loop(){
|
private loop(){
|
||||||
@ -157,11 +154,6 @@ export class Stream {
|
|||||||
})
|
})
|
||||||
this.request = stream
|
this.request = stream
|
||||||
stream.pipe(this.stream, { end : false })
|
stream.pipe(this.stream, { end : false })
|
||||||
stream.once('data', () => {
|
|
||||||
if(this.per_sec_bytes === 0){
|
|
||||||
this.per_sec_bytes = Math.ceil((stream.downloadProgress.total as number)/this.duration)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
stream.once('error', (err) => {
|
stream.once('error', (err) => {
|
||||||
this.stream.emit('error', err)
|
this.stream.emit('error', err)
|
||||||
@ -170,7 +162,7 @@ export class Stream {
|
|||||||
stream.on('data', (chunk: any) => {
|
stream.on('data', (chunk: any) => {
|
||||||
absolute_bytes += chunk.length
|
absolute_bytes += chunk.length
|
||||||
this.bytes_count += chunk.length
|
this.bytes_count += chunk.length
|
||||||
if(absolute_bytes > (this.per_sec_bytes * 300) && this.per_sec_bytes !== 0){
|
if(absolute_bytes > (this.per_sec_bytes * 300)){
|
||||||
stream.destroy()
|
stream.destroy()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@ -50,7 +50,7 @@ export async function stream(url : string, cookie? : string): Promise<Stream | L
|
|||||||
return 0
|
return 0
|
||||||
})
|
})
|
||||||
if(resp === 0){
|
if(resp === 0){
|
||||||
return await stream(info.video_details.url)
|
return await stream(info.video_details.url, cookie)
|
||||||
}
|
}
|
||||||
else if(typeof resp !== "number") resp.destroy()
|
else if(typeof resp !== "number") resp.destroy()
|
||||||
|
|
||||||
@ -71,10 +71,10 @@ export async function stream(url : string, cookie? : string): Promise<Stream | L
|
|||||||
final.push(info.format[info.format.length - 1])
|
final.push(info.format[info.format.length - 1])
|
||||||
}
|
}
|
||||||
|
|
||||||
return new Stream(final[0].url, type, info.video_details.durationInSec)
|
return new Stream(final[0].url, type, info.video_details.durationInSec, Number(final[0].contentLength))
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function stream_from_info(info : InfoData): Promise<Stream | LiveStreaming>{
|
export async function stream_from_info(info : InfoData, cookie? : string): Promise<Stream | LiveStreaming>{
|
||||||
let final: any[] = [];
|
let final: any[] = [];
|
||||||
let type : StreamType;
|
let type : StreamType;
|
||||||
if(info.LiveStreamData.isLive === true && info.LiveStreamData.hlsManifestUrl !== null && info.video_details.durationInSec === '0') {
|
if(info.LiveStreamData.isLive === true && info.LiveStreamData.hlsManifestUrl !== null && info.video_details.durationInSec === '0') {
|
||||||
@ -90,7 +90,7 @@ export async function stream_from_info(info : InfoData): Promise<Stream | LiveSt
|
|||||||
return 0
|
return 0
|
||||||
})
|
})
|
||||||
if(resp === 0){
|
if(resp === 0){
|
||||||
return await stream(info.video_details.url)
|
return await stream(info.video_details.url, cookie)
|
||||||
}
|
}
|
||||||
else if(typeof resp !== "number") resp.destroy()
|
else if(typeof resp !== "number") resp.destroy()
|
||||||
|
|
||||||
@ -111,7 +111,7 @@ export async function stream_from_info(info : InfoData): Promise<Stream | LiveSt
|
|||||||
final.push(info.format[info.format.length - 1])
|
final.push(info.format[info.format.length - 1])
|
||||||
}
|
}
|
||||||
|
|
||||||
return new Stream(final[0].url, type, info.video_details.durationInSec)
|
return new Stream(final[0].url, type, info.video_details.durationInSec, Number(final[0].contentLength))
|
||||||
}
|
}
|
||||||
|
|
||||||
function filterFormat(formats : any[], codec : string){
|
function filterFormat(formats : any[], codec : string){
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user