vdj 1.3.0 → 1.4.0

package/dist/default_implementations/youtube/song.d.ts

@@ -17,5 +17,5 @@ export default class YouTubeSong extends Song {
     constructor(service: YouTubeService, video: Video, playlistID?: string, logger?: Logger, seek?: number);
     getSongInfo(): Promise<SongInfo>;
     static extractSeek(url: string): number;
-    stream(): ReadableStream;
+    stream(): ReadableStream | null;
 }

package/dist/default_implementations/youtube/song.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const ytdl = require("ytdl-core");
+const youtube_dl_exec_1 = require("youtube-dl-exec");
 const core_1 = require("../../core");
 class YouTubeSong extends core_1.Song {
     constructor(service, video, playlistID, logger, seek = 0) {
@@ -60,19 +60,14 @@ class YouTubeSong extends core_1.Song {
         return 0;
     }
     stream() {
-        const options = {};
-        if (this.live) {
-            options.quality = [128, 127, 120, 96, 95, 94, 93];
-        }
-        else {
-            options.filter = 'audioonly';
-            options.range = {
-                start: this.seek > 0 ? this.seek : 0
-            };
-        }
-        if (typeof (this.logger) == 'function')
-            this.logger(`[${this.type}] Fetching stream url for ${this.URL}.`);
-        return ytdl(this.trackID, options);
+        const stream = youtube_dl_exec_1.exec(this.streamURL, {
+            output: '-',
+            format: 'bestaudio[ext=webm+acodec=opus+tbr>100]/bestaudio[ext=webm+acodec=opus]/bestaudio/best',
+            limitRate: '1M',
+            rmCacheDir: true,
+            verbose: true,
+        }, { stdio: ['ignore', 'pipe', 'ignore'] });
+        return stream.stdout;
     }
 }
 exports.default = YouTubeSong;

package/dist/default_implementations/youtubedl/service.js

@@ -31,13 +31,13 @@ class YoutubedlService {
     }
     canFetch(target, logger) {
         return __awaiter(this, void 0, void 0, function* () {
-            var res = yield youtube_dl_exec_1.default(target, { j: true }, {});
+            var res = yield youtube_dl_exec_1.default(target, { dumpJson: true }, {});
             return !!res;
         });
     }
     getSongInfo(url, logger) {
         return __awaiter(this, void 0, void 0, function* () {
-            var res = yield youtube_dl_exec_1.default(url, { j: true, "no-check-certificate": true, "add-metadata": true }, {});
+            var res = yield youtube_dl_exec_1.default(url, { dumpJson: true, noCheckCertificate: true, addMetadata: true }, {});
             return {
                 full: true,
                 metadataType: "youtubedl",

package/dist/default_implementations/youtubedl/song.js

@@ -33,9 +33,14 @@ class YoutubedlSong extends core_1.Song {
         });
     }
     stream() {
-        if (typeof (this.logger) == 'function')
-            this.logger(`[${this.type}] Fetching stream for ${this.URL}.`);
-        return youtube_dl_exec_1.raw(this.streamURL, { _: ['-f', 'bestaudio/best[height<=?480]', '-o', '-'] }, {}).stdout;
+        const stream = youtube_dl_exec_1.exec(this.streamURL, {
+            output: '-',
+            format: 'bestaudio[ext=webm+acodec=opus+tbr>100]/bestaudio[ext=webm+acodec=opus]/bestaudio/best',
+            limitRate: '1M',
+            rmCacheDir: true,
+            verbose: true,
+        }, { stdio: ['ignore', 'pipe', 'ignore'] });
+        return stream.stdout;
     }
 }
 exports.default = YoutubedlSong;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vdj",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -19,7 +19,7 @@
     "@types/node": "^12.19.2",
     "got": "^11.8.0",
     "simple-youtube-api": "^5.2.1",
-    "youtube-dl-exec": "^1.2.13",
+    "youtube-dl-exec": "^2.1.5",
     "ytdl-core": "^4.11.2"
   }
 }

package/src/default_implementations/youtube/song.ts

@@ -1,6 +1,6 @@
 import { Readable as ReadableStream } from 'stream';
 import { Video } from 'simple-youtube-api';
-import ytdl = require('ytdl-core');
+import { exec as ytdlexec } from 'youtube-dl-exec';
 
 import { Song, SongInfo, Logger } from '../../core';
 import YouTubeService from './service';
@@ -62,20 +62,19 @@ export default class YouTubeSong extends Song {
     return 0;
   }
 
-  public stream(): ReadableStream {
-    const options: any = {};
-    
-    if(this.live) {
-        options.quality = [128,127,120,96,95,94,93];
-    } else {
-        options.filter = 'audioonly';
-        
-        options.range = {
-          start: this.seek > 0 ? this.seek : 0
-        }
-    }
-    
-    if (typeof(this.logger) == 'function') this.logger(`[${this.type}] Fetching stream url for ${this.URL}.`);
-    return ytdl(this.trackID, options);
+  public stream(): ReadableStream | null {
+    const stream = ytdlexec(
+      this.streamURL,
+      {
+        output: '-',
+        format:
+          'bestaudio[ext=webm+acodec=opus+tbr>100]/bestaudio[ext=webm+acodec=opus]/bestaudio/best',
+        limitRate: '1M',
+        rmCacheDir: true,
+        verbose: true,
+      },
+      { stdio: ['ignore', 'pipe', 'ignore'] }
+    );
+    return stream.stdout;
   }
 }

package/src/default_implementations/youtubedl/service.ts

@@ -15,12 +15,12 @@ export default class YoutubedlService implements IService {
     }
 
     public async canFetch(target: string, logger?: Logger): Promise<boolean> {
-        var res = await youtubedl(target, {j: true}, {});
+        var res = await youtubedl(target, { dumpJson: true }, {});
         return !!res;
     }
 
     public async getSongInfo(url: string, logger?: Logger): Promise<SongInfo> {
-        var res = await youtubedl(url, {j: true, "no-check-certificate": true, "add-metadata": true}, {});
+        var res = await youtubedl(url, { dumpJson: true, noCheckCertificate: true, addMetadata: true }, {});
         return {
             full: true,
             metadataType: "youtubedl",
@@ -38,10 +38,10 @@ export default class YoutubedlService implements IService {
         if (!dateString) {
             return undefined;
         }
-        const year = dateString.slice(0,4);
-        const month = dateString.slice(4,6);
-        const day = dateString.slice(6,8);
-        
+        const year = dateString.slice(0, 4);
+        const month = dateString.slice(4, 6);
+        const day = dateString.slice(6, 8);
+
         return new Date(`${year} ${month} ${day}`)
     }
 }

package/src/default_implementations/youtubedl/song.ts

@@ -1,6 +1,6 @@
 import { Readable as ReadableStream } from 'stream';
 import { Song, SongInfo, Logger } from '../../core';
-import { raw as youtubedl } from 'youtube-dl-exec';
+import { exec as ytdlexec } from 'youtube-dl-exec';
 import YoutubedlService from './service';
 
 export default class YoutubedlSong extends Song {
@@ -30,7 +30,18 @@ export default class YoutubedlSong extends Song {
   }
 
   public stream(): ReadableStream | null {
-    if (typeof (this.logger) == 'function') this.logger(`[${this.type}] Fetching stream for ${this.URL}.`);
-    return youtubedl(this.streamURL, { _: ['-f', 'bestaudio/best[height<=?480]', '-o', '-'] }, {}).stdout;
+    const stream = ytdlexec(
+      this.streamURL,
+      {
+        output: '-',
+        format:
+          'bestaudio[ext=webm+acodec=opus+tbr>100]/bestaudio[ext=webm+acodec=opus]/bestaudio/best',
+        limitRate: '1M',
+        rmCacheDir: true,
+        verbose: true,
+      },
+      { stdio: ['ignore', 'pipe', 'ignore'] }
+    );
+    return stream.stdout;
   }
 }