vdj 1.6.0 → 1.6.2

package/dist/default_implementations/youtube/song.js

@@ -66,7 +66,10 @@ class YouTubeSong extends core_1.Song {
             limitRate: '1M',
             rmCacheDir: true,
             verbose: true,
-        }, { stdio: ['ignore', 'pipe', 'ignore'] });
+        }, { stdio: ['ignore', 'pipe', 'ignore'], });
+        stream.on('error', (err) => {
+            this.logger && this.logger(`[${this.type}] Error while streaming: ${err}`);
+        });
         return stream.stdout;
     }
 }

package/dist/default_implementations/youtubedl/service.js

@@ -40,14 +40,14 @@ class YoutubedlService {
             var res = yield (0, youtube_dl_exec_1.default)(url, { dumpSingleJson: true, noCheckCertificates: true, addMetadata: true }, {});
             if (typeof res === 'string') {
                 return {
-                    full: false,
+                    full: true,
                     metadataType: "youtubedl",
-                    imgURL: undefined,
+                    imgURL: "",
                     title: url,
-                    duration: undefined,
+                    duration: 0,
                     url: url,
                     artist: [],
-                    date: undefined,
+                    date: new Date(),
                     custom: {}
                 };
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vdj",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/default_implementations/youtube/song.ts

@@ -62,17 +62,29 @@ export default class YouTubeSong extends Song {
   }
 
   public stream(): ReadableStream | null {
-    const stream = ytdlexec(
-      this.streamURL,
-      {
-        output: '-',
-        format: 'bestaudio/best',
-        limitRate: '1M',
-        rmCacheDir: true,
-        verbose: true,
-      },
-      { stdio: ['ignore', 'pipe', 'ignore'] }
-    );
-    return stream.stdout;
+    try {
+      const stream = ytdlexec(
+        this.streamURL,
+        {
+          output: '-',
+          format: 'bestaudio/best',
+          limitRate: '1M',
+          rmCacheDir: true,
+          verbose: true,
+        },
+        { stdio: ['ignore', 'pipe', 'ignore'],  }
+      );
+      stream.on('error', (err) => {
+        this.logger && this.logger(`[${this.type}] Error while streaming: ${err}`);
+      });
+      stream.catch((err) => {
+        this.logger && this.logger(`[${this.type}] Error while streaming: ${err}`);
+      });
+      return stream.stdout;
+    }
+    catch (err) {
+      this.logger && this.logger(`[${this.type}] Error while streaming: ${err}`);
+    }
+    return null;
   }
 }

package/test/test.js

@@ -15,13 +15,17 @@ function sortOfDeepEqual(actual, expected) {
     return assert.deepEqual(strippedActual, expected);
 }
 
-describe("Playlist", function () {
+describe("Playlist", function () {    
     before(function () {
         playlist = new vdj.Playlist({
             services: [],
         });
     });
 
+    beforeEach(function () {
+        playlist.clear();
+    });
+
     describe("#add", function () {
         it("should return the not found targets", async function () {
             const input = ["first", "second"];
@@ -118,6 +122,26 @@ describe("Playlist", function () {
                 assert.equal(result, expected);
             });
         });
+        describe("#next", function () {
+            
+            it("should go to next song", async function () {
+                const input = [
+                    "https://www.youtube.com/watch?v=fmrA-gxJxgQ",
+                    "https://www.youtube.com/watch?v=DDjcqu9uvUE",
+                    "https://www.youtube.com/watch?v=lBnAY4VH9T4",
+                ];
+                await playlist.add(input);
+                const current1 = playlist.current;
+                await playlist.next();
+                const current2 = playlist.current;
+                await playlist.next();
+                const current3 = playlist.current;
+                assert.equal(current1.URL, input[0]);
+                assert.equal(current2.URL, input[1]);
+                assert.equal(current3.URL, input[2]);
+            });
+        });
+        
         describe("#getSongInfo", function () {
             it("should return a lot more information from working youtube video link", async function () {
                 const input = "https://www.youtube.com/watch?v=FtsefkeIE7k";
@@ -142,7 +166,7 @@ describe("Playlist", function () {
             });
         });
         describe("#add", function () {
-            this.timeout(5000);
+            this.timeout(10000);
             it("should return a YoutubedlSong from working ogg link", async function () {
                 const input = ["https://upload.wikimedia.org/wikipedia/commons/d/de/Lorem_ipsum.ogg"];
                 const expected = {
@@ -170,7 +194,7 @@ describe("Playlist", function () {
             });
         });
         describe("#getSongInfo", function () {
-            this.timeout(5000);
+            this.timeout(10000);
             it("should return a lot more information from working youtube link", async function () {
                 const input = "https://www.youtube.com/watch?v=232fF5ECnGo";
                 const expected = {
@@ -187,7 +211,7 @@ describe("Playlist", function () {
             });
         });
         describe("#getSongInfo", function () {
-            this.timeout(5000);
+            this.timeout(10000);
             it("should return a lot more information from working soundcloud link", async function () {
                 const input = "https://soundcloud.com/bionicelcor/wakusei-abnormal";
                 const expected = {