vdj 1.1.3 → 1.1.6

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, { _: ['-f', 'bestaudio/best[height<=?480]', '-o', '-'] }, {}).stdout;
     }
 }
 exports.default = YoutubedlSong;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vdj",
-  "version": "1.1.3",
+  "version": "1.1.6",
   "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);
+            });
+        });
+        */
+    });
 });

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

@@ -1,10 +0,0 @@
-import { IService, SongInfo, Logger } from '../../core/';
-import YoutubedlSong from './song';
-export default class YoutubedlService implements IService {
-    canSearch: boolean;
-    type: string;
-    fetch(targets: string[], logger?: Logger): Promise<YoutubedlSong[]>;
-    search(): Promise<YoutubedlSong[]>;
-    canFetch(target: string, logger?: Logger): Promise<boolean>;
-    getSongInfo(url: string, logger?: Logger): Promise<SongInfo>;
-}

package/dist/default_implementations/direct/service.js

@@ -1,54 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const song_1 = __importDefault(require("./song"));
-const youtube_dl_1 = __importDefault(require("youtube-dl"));
-class YoutubedlService {
-    constructor() {
-        this.canSearch = false;
-        this.type = 'youtubedl';
-    }
-    fetch(targets, logger) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return targets.map(x => new song_1.default(this, x, logger));
-        });
-    }
-    search() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return [];
-        });
-    }
-    canFetch(target, logger) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise(resolve => {
-                youtube_dl_1.default.exec(target, ['-j'], {}, (err) => resolve(!!err));
-            });
-        });
-    }
-    getSongInfo(url, logger) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return {
-                full: true,
-                metadataType: "unknown",
-                imgURL: "",
-                title: url,
-                duration: 0,
-                url: url,
-                artist: [],
-                date: new Date(),
-                custom: {}
-            };
-        });
-    }
-}
-exports.default = YoutubedlService;

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

@@ -1,14 +0,0 @@
-/// <reference types="node" />
-import { Readable as ReadableStream } from 'stream';
-import { Song, SongInfo, Logger } from '../../core';
-import YoutubedlService from './service';
-export default class YoutubedlSong extends Song {
-    readonly type: string;
-    readonly streamURL: string;
-    readonly URL: string;
-    info: SongInfo;
-    logger?: Logger;
-    constructor(service: YoutubedlService, url: string, logger?: Logger);
-    getSongInfo(): Promise<SongInfo>;
-    stream(): ReadableStream;
-}

package/dist/default_implementations/direct/song.js

@@ -1,43 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("../../core");
-const youtube_dl_1 = __importDefault(require("youtube-dl"));
-class YoutubedlSong extends core_1.Song {
-    constructor(service, url, logger) {
-        super(service);
-        this.type = 'youtubedl';
-        this.streamURL = url;
-        this.URL = url;
-        this.info = {
-            full: false,
-            metadataType: this.type,
-            url: this.URL
-        };
-        this.logger = logger;
-    }
-    getSongInfo() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.info.full) {
-                this.info = yield this.service.getSongInfo(this.URL);
-            }
-            return this.info;
-        });
-    }
-    stream() {
-        if (typeof (this.logger) == 'function')
-            this.logger(`[${this.type}] Fetching stream for ${this.URL}.`);
-        return youtube_dl_1.default(this.streamURL, [], {});
-    }
-}
-exports.default = YoutubedlSong;