vdj 1.1.1 → 1.1.4

package/dist/default_implementations/youtubedl/service.d.ts

@@ -7,4 +7,5 @@ export default class YoutubedlService implements IService {
     search(): Promise<YoutubedlSong[]>;
     canFetch(target: string, logger?: Logger): Promise<boolean>;
     getSongInfo(url: string, logger?: Logger): Promise<SongInfo>;
+    private parseDate;
 }

package/dist/default_implementations/youtubedl/service.js

@@ -37,19 +37,28 @@ class YoutubedlService {
     }
     getSongInfo(url, logger) {
         return __awaiter(this, void 0, void 0, function* () {
-            var res = yield youtube_dl_exec_1.default(url, { j: true }, {});
+            var res = yield youtube_dl_exec_1.default(url, { j: true, "no-check-certificate": true, "add-metadata": true }, {});
             return {
                 full: true,
                 metadataType: "youtubedl",
                 imgURL: res.thumbnail,
                 title: res.title || url,
-                duration: 0,
+                duration: res.duration,
                 url: url,
-                artist: [res.artist],
-                date: res.upload_date,
+                artist: res.artist ? [res.artist] : [],
+                date: this.parseDate(res.upload_date),
                 custom: {}
             };
         });
     }
+    parseDate(dateString) {
+        if (!dateString) {
+            return undefined;
+        }
+        const year = dateString.slice(0, 4);
+        const month = dateString.slice(4, 6);
+        const day = dateString.slice(6, 8);
+        return new Date(`${year} ${month} ${day}`);
+    }
 }
 exports.default = YoutubedlService;

package/dist/default_implementations/youtubedl/song.js

@@ -35,7 +35,7 @@ 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, { "o": true }, {}).stdout;
+        return youtube_dl_exec_1.raw(this.streamURL, { "o": true, "f": "bestvideo[height<=?480]+bestaudio/best[height<=480]", _: ['-'] }, {}).stdout;
     }
 }
 exports.default = YoutubedlSong;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vdj",
-  "version": "1.1.1",
+  "version": "1.1.4",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -20,6 +20,6 @@
     "got": "^11.8.0",
     "simple-youtube-api": "^5.2.1",
     "youtube-dl-exec": "^1.2.13",
-    "ytdl-core": "^4.9.1"
+    "ytdl-core": "^4.11.0"
   }
 }

package/src/default_implementations/youtubedl/service.ts

@@ -20,17 +20,28 @@ export default class YoutubedlService implements IService {
     }
 
     public async getSongInfo(url: string, logger?: Logger): Promise<SongInfo> {
-        var res = await youtubedl(url, {j: true}, {});
+        var res = await youtubedl(url, {j: true, "no-check-certificate": true, "add-metadata": true}, {});
         return {
             full: true,
             metadataType: "youtubedl",
             imgURL: res.thumbnail,
             title: res.title || url,
-            duration: 0,
+            duration: res.duration,
             url: url,
-            artist: [res.artist],
-            date: res.upload_date,
+            artist: res.artist ? [res.artist] : [],
+            date: this.parseDate(res.upload_date),
             custom: {}
         };
     }
+
+    private parseDate(dateString: string): Date | undefined {
+        if (!dateString) {
+            return undefined;
+        }
+        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

@@ -29,8 +29,8 @@ export default class YoutubedlSong extends Song {
     return this.info;
   }
 
-  public stream(): ReadableStream | null{
+  public stream(): ReadableStream | null {
     if (typeof (this.logger) == 'function') this.logger(`[${this.type}] Fetching stream for ${this.URL}.`);
-    return youtubedl(this.streamURL, {"o": true}, {}).stdout;
+    return youtubedl(this.streamURL, { _: ['-f', 'bestaudio/best[height<=?480]', '-o', '-'] }, {}).stdout;
   }
 }

package/test/test.js

@@ -93,13 +93,12 @@ describe('Playlist', function () {
                 assert.equal(result, expected);
             });
             it('should return multiple YouTubeSongs from youtube playlist link', async function () {
-                const input = ['https://www.youtube.com/playlist?list=PL4649F0DBF0FC09E3'];
-                const expected = 62;
+                const input = ['https://www.youtube.com/playlist?list=PLFJU3fqbXA2e1_wAqOn7IoRB02nCfsAVh'];
                 const result = (await playlist.add(input)).added.length;
-                assert.equal(result, expected);
+                assert.isAbove(result, 1);
             });
             it('should return one YouTubeSong from youtube video link with playlist parameter', async function () {
-                const input = ['https://www.youtube.com/watch?v=uS52j0IU1D0&list=PL4649F0DBF0FC09E3&index=3'];
+                const input = ['https://www.youtube.com/watch?v=wSCEC0lYTzk&list=PLFJU3fqbXA2e1_wAqOn7IoRB02nCfsAVh&index=67'];
                 const expected = 1;
                 const result = (await playlist.add(input)).added.length;
                 assert.equal(result, expected);
@@ -171,4 +170,42 @@ describe('Service', function () {
             });
         });
     });
+    describe('Youtubedl', function () {
+        describe('#getSongInfo', function () {
+            this.timeout(5000);
+            it('should return a lot more information from working soundcloud link', async function () {
+                const input = 'https://soundcloud.com/bionicelcor/wakusei-abnormal';
+                const expected = {
+                    full: true,
+                    metadataType: "youtubedl",
+                    url: input,
+                    title: "ふこうぶつ -- Wakusei Abnormal",
+                    duration: 164.638,
+                    artist: [],
+                    date: new Date(1512946800000)
+                };
+                const result = await youtubedlService.getSongInfo(input, console.log);
+                sortOfDeepEqual(result, expected);
+            });
+        });
+        /* TODO: figure this out
+        describe('#getSongInfo', function () {
+            this.timeout(5000);
+            it('should return a lot more information from working mp3 link with metadata', async function () {
+                const input = 'https://yourgi.ga/bCy/adUdC.mp3';
+                const expected = {
+                    full: true,
+                    metadataType: "youtubedl",
+                    url: input,
+                    title: "ふこうぶつ -- Wakusei Abnormal",
+                    duration: 164.638,
+                    artist: [],
+                    date: new Date(1512946800000)
+                };
+                const result = await youtubedlService.getSongInfo(input, console.log);
+                sortOfDeepEqual(result, expected);
+            });
+        });
+        */
+    });
 });