diff --git a/examples/play[LiveStream(search)].js b/examples/play[LiveStream(search)].js index 0af8b7a..4aa6279 100644 --- a/examples/play[LiveStream(search)].js +++ b/examples/play[LiveStream(search)].js @@ -21,7 +21,7 @@ client.on('messageCreate', async message => { /* OR if you want to stream Live Video have less delay - let stream = await youtube.stream(yt_info[0].url, { actual_live : true }) + let stream = await youtube.stream(yt_info[0].url, { low_latency : true }) OR if you want higher quality audio Live Stream @@ -31,7 +31,7 @@ client.on('messageCreate', async message => { OR both - let stream = await youtube.stream(yt_info[0].url, { actual_live : true ,preferred_quality : "480p"}) + let stream = await youtube.stream(yt_info[0].url, { low_latency : true ,preferred_quality : "480p"}) */ let resource = createAudioResource(stream.stream, { diff --git a/examples/play[LiveStream(url)].js b/examples/play[LiveStream(url)].js index 26df27e..c0dd13f 100644 --- a/examples/play[LiveStream(url)].js +++ b/examples/play[LiveStream(url)].js @@ -20,7 +20,7 @@ client.on('messageCreate', async message => { /* OR if you want to stream Live Video have less delay - let stream = await youtube.stream(args, { actual_live : true }) + let stream = await youtube.stream(args, { low_latency : true }) OR if you want higher quality audio Live Stream @@ -30,7 +30,7 @@ client.on('messageCreate', async message => { OR both - let stream = await youtube.stream(args, { actual_live : true ,preferred_quality : "480p"}) + let stream = await youtube.stream(args, { low_latency : true ,preferred_quality : "480p"}) */ let resource = createAudioResource(stream.stream, { diff --git a/play-dl/YouTube/classes/LiveStream.ts b/play-dl/YouTube/classes/LiveStream.ts index 84b49c3..4e2b755 100644 --- a/play-dl/YouTube/classes/LiveStream.ts +++ b/play-dl/YouTube/classes/LiveStream.ts @@ -12,15 +12,15 @@ export interface FormatInterface{ export class LiveStreaming{ type : StreamType stream : PassThrough - private actual_live : boolean; + private low_latency : boolean; private format : FormatInterface private interval : number private packet_count : number private timer : NodeJS.Timer | null private segments_urls : string[] - constructor(format : FormatInterface, actual_live : boolean){ + constructor(format : FormatInterface, low_latency : boolean){ this.type = StreamType.Arbitrary - this.actual_live = actual_live || false + this.low_latency = low_latency || false this.format = format this.stream = new PassThrough({ highWaterMark : 10 * 1000 * 1000 }) this.segments_urls = [] @@ -30,7 +30,7 @@ export class LiveStreaming{ this.stream.on('close', () => { this.cleanup() }); - (this.actual_live) ? this.live_loop() :this.start() + (this.low_latency) ? this.live_loop() :this.start() } private async live_loop(){ @@ -39,7 +39,7 @@ export class LiveStreaming{ return } await this.manifest_getter() - this.segments_urls.splice(0, (this.segments_urls.length / 2)) + this.segments_urls.splice(0, this.segments_urls.length - 2) if(this.packet_count === 0) this.packet_count = Number(this.segments_urls[0].split('index.m3u8/sq/')[1].split('/')[0]) for await (let url of this.segments_urls){ await (async () => { @@ -57,7 +57,7 @@ export class LiveStreaming{ }) })() } - this.interval = 1 * 1000 + this.interval = this.format.targetDurationSec this.timer = setTimeout(async () => { await this.looping() }, this.interval) @@ -69,6 +69,7 @@ export class LiveStreaming{ return } await this.manifest_getter() + this.segments_urls.splice(0, (this.segments_urls.length / 2)) for await (let url of this.segments_urls){ await (async () => { return new Promise(async (resolve, reject) => { @@ -85,7 +86,6 @@ export class LiveStreaming{ }) })() } - this.interval = 1 * 1000 this.timer = setTimeout(async () => { await this.looping() }, this.interval) diff --git a/play-dl/YouTube/stream.ts b/play-dl/YouTube/stream.ts index 7b97db8..0140c50 100644 --- a/play-dl/YouTube/stream.ts +++ b/play-dl/YouTube/stream.ts @@ -10,7 +10,7 @@ export enum StreamType{ } interface StreamOptions { - actual_live : boolean; + low_latency : boolean; preferred_quality : "144p" | "240p" | "360p" | "480p" | "720p" | "1080p" } @@ -38,11 +38,11 @@ function parseAudioFormats(formats : any[]){ return result } -export async function stream(url : string, options : StreamOptions = { actual_live : false, preferred_quality : "144p" }): Promise{ +export async function stream(url : string, options : StreamOptions = { low_latency : false, preferred_quality : "144p" }): Promise{ let info = await video_info(url) let final: any[] = []; let type : StreamType; - if(!options.actual_live) options.actual_live = false + if(!options.low_latency) options.low_latency = false if(!options.preferred_quality) options.preferred_quality = "144p" if(info.LiveStreamData.isLive === true && info.LiveStreamData.hlsManifestUrl !== null) { return await live_stream(info as InfoData, options) @@ -68,10 +68,10 @@ export async function stream(url : string, options : StreamOptions = { actual_li return new Stream(final[0].url, type) } -export async function stream_from_info(info : InfoData, options : StreamOptions = { actual_live : false, preferred_quality : "144p" }): Promise{ +export async function stream_from_info(info : InfoData, options : StreamOptions = { low_latency : false, preferred_quality : "144p" }): Promise{ let final: any[] = []; let type : StreamType; - if(!options.actual_live) options.actual_live = false + if(!options.low_latency) options.low_latency = false if(!options.preferred_quality) options.preferred_quality = "144p" if(info.LiveStreamData.isLive === true && info.LiveStreamData.hlsManifestUrl !== null) { return await live_stream(info as InfoData, options) @@ -117,7 +117,7 @@ async function live_stream(info : InfoData, options : StreamOptions): Promise