Histmy/play-dl-fix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0.7.7 Update

Browse Source 
0.7.7
This commit is contained in:
Killer069 2021-09-03 17:59:50 +05:30 committed by GitHub
commit a35f0cbad5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 47 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -55,8 +55,12 @@ if(validate(url) || validate_playlist(url)) // This will check both and if anyon
### stream(url : `string`, cookie? : `string`) ### stream(url : `string`, cookie? : `string`)
*This is basic to create a youtube stream from a url.* *This is basic to create a youtube stream from a url.*
<<<<<<< HEAD
**Cookies are optional and are required for playing age restricted videos.**
=======
**[Cookies](https://github.com/play-dl/play-dl/discussions/34) are optional and are required for playing age restricted videos.** **[Cookies](https://github.com/play-dl/play-dl/discussions/34) are optional and are required for playing age restricted videos.**
>>>>>>> 4487ef38a991af12fb1660bc7ffe3cf7418433ca
```js ```js
let source = await stream("url") // This will create a stream Class which contains type and stream to be played. let source = await stream("url") // This will create a stream Class which contains type and stream to be played.
let resource = createAudioResource(source.stream, { let resource = createAudioResource(source.stream, {
@ -98,6 +102,7 @@ console.log(results[0].url);
### video_basic_info(url : `string`, cookie? : `string`) ### video_basic_info(url : `string`, cookie? : `string`)
*The basic video details `play-dl` fetches at first.* *The basic video details `play-dl` fetches at first.*
**Cookies are optional and are required for playing age restricted videos.**
**[Cookies](https://github.com/play-dl/play-dl/discussions/34) are optional and are required for playing age restricted videos.** **[Cookies](https://github.com/play-dl/play-dl/discussions/34) are optional and are required for playing age restricted videos.**
@ -106,6 +111,7 @@ const video = await video_basic_info(url)
``` ```
### video_info(url : `string`, cookie? : `string`) ### video_info(url : `string`, cookie? : `string`)
*This contains everything with deciphered formats along with `video_details`.* *This contains everything with deciphered formats along with `video_details`.*
**Cookies are optional and are required for playing age restricted videos.**
**[Cookies](https://github.com/play-dl/play-dl/discussions/34) are optional and are required for playing age restricted videos.** **[Cookies](https://github.com/play-dl/play-dl/discussions/34) are optional and are required for playing age restricted videos.**

162
play-dl/YouTube/classes/LiveStream.ts
View File

@ -2,6 +2,7 @@ import { PassThrough } from 'stream'
import got from 'got' import got from 'got'
import { StreamType } from '../stream'; import { StreamType } from '../stream';
import Request from 'got/dist/source/core'; import Request from 'got/dist/source/core';
import { video_info } from '..';
export interface FormatInterface{ export interface FormatInterface{
url : string; url : string;
@ -17,9 +18,11 @@ export class LiveStreaming{
private interval : number private interval : number
private packet_count : number private packet_count : number
private timer : NodeJS.Timer | null private timer : NodeJS.Timer | null
private video_url : string
private dash_timer : NodeJS.Timer | null
private segments_urls : string[] private segments_urls : string[]
private request : Request | null private request : Request | null
constructor(dash_url : string, target_interval : number){ constructor(dash_url : string, target_interval : number, video_url : string){
this.type = StreamType.Arbitrary this.type = StreamType.Arbitrary
this.url = dash_url this.url = dash_url
this.base_url = '' this.base_url = ''
@ -28,13 +31,27 @@ export class LiveStreaming{
this.packet_count = 0 this.packet_count = 0
this.request = null this.request = null
this.timer = null this.timer = null
this.video_url = video_url
this.interval = target_interval * 1000 || 0 this.interval = target_interval * 1000 || 0
this.dash_timer = setTimeout(() => {
this.dash_updater()
}, 1800000)
this.stream.on('close', () => { this.stream.on('close', () => {
this.cleanup() this.cleanup()
}); });
this.start() this.start()
} }
private async dash_updater(){
let info = await video_info(this.video_url)
if(info.LiveStreamData.isLive === true && info.LiveStreamData.hlsManifestUrl !== null && info.video_details.durationInSec === '0'){
this.url = info.LiveStreamData.dashManifestUrl
}
this.dash_timer = setTimeout(() => {
this.dash_updater()
}, 1800000)
}
private async dash_getter(){ private async dash_getter(){
let response = await got(this.url) let response = await got(this.url)
let audioFormat = response.body.split('<AdaptationSet id="0"')[1].split('</AdaptationSet>')[0].split('</Representation>') let audioFormat = response.body.split('<AdaptationSet id="0"')[1].split('</AdaptationSet>')[0].split('</Representation>')
@ -47,7 +64,10 @@ export class LiveStreaming{
private cleanup(){ private cleanup(){
clearTimeout(this.timer as NodeJS.Timer) clearTimeout(this.timer as NodeJS.Timer)
clearTimeout(this.dash_timer as NodeJS.Timer)
this.request?.destroy() this.request?.destroy()
this.dash_timer = null
this.video_url = ''
this.request = null this.request = null
this.timer = null this.timer = null
this.url = '' this.url = ''
@ -63,6 +83,7 @@ export class LiveStreaming{
return return
} }
await this.dash_getter() await this.dash_getter()
if(this.segments_urls.length > 3) this.segments_urls.splice(0, this.segments_urls.length - 3)
if(this.packet_count === 0) this.packet_count = Number(this.segments_urls[0].split('sq/')[1].split('/')[0]) if(this.packet_count === 0) this.packet_count = Number(this.segments_urls[0].split('sq/')[1].split('/')[0])
for await (let segment of this.segments_urls){ for await (let segment of this.segments_urls){
if(Number(segment.split('sq/')[1].split('/')[0]) !== this.packet_count){ if(Number(segment.split('sq/')[1].split('/')[0]) !== this.packet_count){
@ -89,80 +110,6 @@ export class LiveStreaming{
} }
} }
export class LiveEnded{
type : StreamType
stream : PassThrough
private url : string;
private base_url : string;
private packet_count : number
private segments_urls : string[]
private request : Request | null
constructor(dash_url : string){
this.type = StreamType.Arbitrary
this.url = dash_url
this.base_url = ''
this.stream = new PassThrough({ highWaterMark : 10 * 1000 * 1000 })
this.segments_urls = []
this.request = null
this.packet_count = 0
this.stream.on('close', () => {
this.cleanup()
})
this.start()
}
private async dash_getter(){
let response = await got(this.url)
let audioFormat = response.body.split('<AdaptationSet id="0"')[1].split('</AdaptationSet>')[0].split('</Representation>')
if(audioFormat[audioFormat.length - 1] === '') audioFormat.pop()
this.base_url = audioFormat[audioFormat.length - 1].split('<BaseURL>')[1].split('</BaseURL>')[0]
let list = audioFormat[audioFormat.length - 1].split('<SegmentList>')[1].split('</SegmentList>')[0]
this.segments_urls = list.replace(new RegExp('<SegmentURL media="', 'g'), '').split('"/>')
if(this.segments_urls[this.segments_urls.length - 1] === '') this.segments_urls.pop()
}
private cleanup(){
this.request?.destroy()
this.request = null
this.url = ''
this.base_url = ''
this.segments_urls = []
this.packet_count = 0
}
private async start(){
if(this.stream.destroyed){
this.cleanup()
return
}
await this.dash_getter()
if(this.packet_count === 0) this.packet_count = Number(this.segments_urls[0].split('sq/')[1].split('/')[0])
for await (let segment of this.segments_urls){
if(this.stream.destroyed){
this.cleanup()
break
}
if(Number(segment.split('sq/')[1].split('/')[0]) !== this.packet_count){
continue
}
await (async () => {
return new Promise(async (resolve, reject) => {
let stream = got.stream(this.base_url + segment)
this.request = stream
stream.on('data', (chunk: any) => this.stream.write(chunk))
stream.on('end', () => {
this.packet_count++
resolve('')
})
stream.once('error', (err) => {
this.stream.emit('error', err)
})
})
})()
}
}
}
export class Stream { export class Stream {
type : StreamType type : StreamType
stream : PassThrough stream : PassThrough
@ -183,11 +130,12 @@ export class Stream {
this.stream.on('close', () => { this.stream.on('close', () => {
this.cleanup() this.cleanup()
}) })
this.duration = duration; this.duration = duration
(duration > 300) ? this.loop_start() : this.normal_start() this.loop()
} }
private cleanup(){ private cleanup(){
console.log('Ending Everything')
clearTimeout(this.timer as NodeJS.Timer) clearTimeout(this.timer as NodeJS.Timer)
this.request?.destroy() this.request?.destroy()
this.request = null this.request = null
@ -197,51 +145,6 @@ export class Stream {
this.per_sec_bytes = 0 this.per_sec_bytes = 0
} }
private normal_start(){
if(this.stream.destroyed){
this.cleanup()
return
}
let stream = got.stream(this.url)
this.request = stream
stream.once('error', (err) => {
this.stream.emit('error', err)
})
stream.pipe(this.stream)
}
private loop_start(){
if(this.stream.destroyed){
this.cleanup()
return
}
let stream = got.stream(this.url)
this.request = stream
stream.once('data', () => {
this.per_sec_bytes = Math.ceil((stream.downloadProgress.total as number)/this.duration)
})
stream.once('error', (err) => {
this.stream.emit('error', err)
})
stream.on('data', (chunk: any) => {
this.bytes_count += chunk.length
this.stream.write(chunk)
})
stream.on('data', () => {
if(this.bytes_count > (this.per_sec_bytes * 300)){
stream.destroy()
}
})
this.timer = setTimeout(() => {
this.loop()
}, 280 * 1000)
}
private loop(){ private loop(){
if(this.stream.destroyed){ if(this.stream.destroyed){
this.cleanup() this.cleanup()
@ -254,18 +157,21 @@ export class Stream {
} }
}) })
this.request = stream this.request = stream
stream.on('data', (chunk: any) => { stream.once('data', () => {
absolute_bytes += chunk.length if(this.per_sec_bytes === 0){
this.bytes_count += chunk.length this.per_sec_bytes = Math.ceil((stream.downloadProgress.total as number)/this.duration)
this.stream.write(chunk) }
}) })
stream.once('error', (err) => { stream.once('error', (err) => {
this.stream.emit('error', err) this.stream.emit('error', err)
}) })
stream.on('data', () => { stream.on('data', (chunk: any) => {
if(absolute_bytes > (this.per_sec_bytes * 300)){ absolute_bytes += chunk.length
this.bytes_count += chunk.length
this.stream.write(chunk)
if(absolute_bytes > (this.per_sec_bytes * 300) && this.per_sec_bytes !== 0){
stream.destroy() stream.destroy()
} }
}) })

20
play-dl/YouTube/stream.ts
View File

@ -1,6 +1,6 @@
import got from "got/dist/source" import got from "got/dist/source"
import { video_info } from "." import { video_info } from "."
import { LiveEnded, LiveStreaming, Stream } from "./classes/LiveStream" import { LiveStreaming, Stream } from "./classes/LiveStream"
export enum StreamType{ export enum StreamType{
Arbitrary = 'arbitrary', Arbitrary = 'arbitrary',
@ -35,11 +35,11 @@ function parseAudioFormats(formats : any[]){
return result return result
} }
export async function stream(url : string, cookie? : string): Promise<Stream | LiveStreaming | LiveEnded>{ export async function stream(url : string, cookie? : string): Promise<Stream | LiveStreaming>{
let info = await video_info(url, cookie) let info = await video_info(url, cookie)
let final: any[] = []; let final: any[] = [];
let type : StreamType; let type : StreamType;
if(info.LiveStreamData.isLive === true && info.LiveStreamData.hlsManifestUrl !== null) { if(info.LiveStreamData.isLive === true && info.LiveStreamData.hlsManifestUrl !== null && info.video_details.durationInSec === '0') {
return live_stream(info as InfoData) return live_stream(info as InfoData)
} }
@ -72,10 +72,10 @@ export async function stream(url : string, cookie? : string): Promise<Stream | L
return new Stream(final[0].url, type, info.video_details.durationInSec) return new Stream(final[0].url, type, info.video_details.durationInSec)
} }
export async function stream_from_info(info : InfoData): Promise<Stream | LiveStreaming | LiveEnded>{ export async function stream_from_info(info : InfoData): Promise<Stream | LiveStreaming>{
let final: any[] = []; let final: any[] = [];
let type : StreamType; let type : StreamType;
if(info.LiveStreamData.isLive === true && info.LiveStreamData.hlsManifestUrl !== null) { if(info.LiveStreamData.isLive === true && info.LiveStreamData.hlsManifestUrl !== null && info.video_details.durationInSec === '0') {
return live_stream(info as InfoData) return live_stream(info as InfoData)
} }
@ -116,13 +116,7 @@ function filterFormat(formats : any[], codec : string){
return result return result
} }
function live_stream(info : InfoData): LiveStreaming | LiveEnded{ function live_stream(info : InfoData): LiveStreaming{
let stream : LiveStreaming | LiveEnded let stream = new LiveStreaming(info.LiveStreamData.dashManifestUrl, info.format[info.format.length - 1].targetDurationSec, info.video_details.url)
if(info.video_details.durationInSec === '0') {
stream = new LiveStreaming(info.LiveStreamData.dashManifestUrl, info.format[info.format.length - 1].targetDurationSec)
}
else {
stream = new LiveEnded(info.LiveStreamData.dashManifestUrl)
}
return stream return stream
} }