vdj 1.5.0 → 1.6.1

package/dist/core/song.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Readable as ReadableStream } from 'stream';
 import { IService, SongInfo } from '.';
 export default abstract class Song {

package/dist/core/types.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { IService, Song } from ".";
 export type SongInfo = {
     full: boolean;

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

@@ -1,4 +1,3 @@
-/// <reference path="../../../src/typings/simple-youtube-api.d.ts" />
 import API = require('simple-youtube-api');
 import { IService, SearchType, SongInfo, Logger } from '../../core/';
 import YouTubeSong from './song';

package/dist/default_implementations/youtube/service.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const API = require("simple-youtube-api");
-const ytdl = require("ytdl-core");
+const ytdl = require("@distube/ytdl-core");
 const song_1 = __importDefault(require("./song"));
 class YouTubeService {
     constructor(key) {

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

@@ -1,5 +1,3 @@
-/// <reference path="../../../src/typings/simple-youtube-api.d.ts" />
-/// <reference types="node" />
 import { Readable as ReadableStream } from 'stream';
 import { Video } from 'simple-youtube-api';
 import { Song, SongInfo, Logger } from '../../core';

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

@@ -38,6 +38,19 @@ class YoutubedlService {
     getSongInfo(url, logger) {
         return __awaiter(this, void 0, void 0, function* () {
             var res = yield (0, youtube_dl_exec_1.default)(url, { dumpSingleJson: true, noCheckCertificates: true, addMetadata: true }, {});
+            if (typeof res === 'string') {
+                return {
+                    full: true,
+                    metadataType: "youtubedl",
+                    imgURL: "",
+                    title: url,
+                    duration: 0,
+                    url: url,
+                    artist: [],
+                    date: new Date(),
+                    custom: {}
+                };
+            }
             return {
                 full: true,
                 metadataType: "youtubedl",

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Readable as ReadableStream } from 'stream';
 import { Song, SongInfo, Logger } from '../../core';
 import YoutubedlService from './service';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vdj",
-  "version": "1.5.0",
+  "version": "1.6.1",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -12,14 +12,14 @@
   "devDependencies": {
     "chai": "^4.2.0",
     "dotenv": "^8.2.0",
-    "typescript": "^3.9.7"
+    "typescript": "^5.7.3"
   },
   "dependencies": {
+    "@distube/ytdl-core": "^4.16.4",
     "@types/node": "^12.19.2",
     "got": "^13.0.0",
     "mocha": "^10.7.3",
     "simple-youtube-api": "^5.2.1",
-    "youtube-dl-exec": "^3.0.7",
-    "ytdl-core": "^4.11.5"
+    "youtube-dl-exec": "^3.0.15"
   }
 }

package/src/default_implementations/youtube/service.ts

@@ -1,5 +1,5 @@
 import API = require('simple-youtube-api');
-import ytdl = require('ytdl-core');
+import ytdl = require("@distube/ytdl-core");
 
 import { IService, SearchType, SongInfo, Logger } from '../../core/';
 import YouTubeSong from './song';

package/src/default_implementations/youtube/song.ts

@@ -71,8 +71,11 @@ export default class YouTubeSong extends Song {
         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/src/default_implementations/youtubedl/service.ts

@@ -20,7 +20,20 @@ export default class YoutubedlService implements IService {
     }
 
     public async getSongInfo(url: string, logger?: Logger): Promise<SongInfo> {
-        var res = await youtubedl(url, { dumpSingleJson: true, noCheckCertificates: true, addMetadata: true }, {});        
+        var res = await youtubedl(url, { dumpSingleJson: true, noCheckCertificates: true, addMetadata: true }, {});
+        if(typeof res === 'string') {
+            return {
+                full: true,
+                metadataType: "youtubedl",
+                imgURL: "",
+                title: url,
+                duration: 0,
+                url: url,
+                artist: [],
+                date: new Date(),
+                custom: {}
+            };
+        }
         return {
             full: true,
             metadataType: "youtubedl",

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,31 +194,24 @@ describe("Playlist", function () {
             });
         });
         describe("#getSongInfo", function () {
-            this.timeout(5000);
-            console.log("hey");
+            this.timeout(10000);
             it("should return a lot more information from working youtube link", async function () {
-                try {
-                    const input = "https://www.youtube.com/watch?v=232fF5ECnGo";
-                    const expected = {
-                        full: true,
-                        metadataType: "youtubedl",
-                        url: input,
-                        title: "Rap God in the style of @LinkinPark​ (Feat. @jonathanymusic)",
-                        duration: 371,
-                        artist: [],
-                        date: new Date(1660773600000),
-                    };
-                    var tes = new vdj.YoutubedlService();
-                    const result = await tes.getSongInfo(input, console.log);
-                    sortOfDeepEqual(result, expected);
-                }
-                catch (e) {
-                    console.log(e);
-                }
+                const input = "https://www.youtube.com/watch?v=232fF5ECnGo";
+                const expected = {
+                    full: true,
+                    metadataType: "youtubedl",
+                    url: input,
+                    title: "Rap God in the style of @LinkinPark​ (Feat. @jonathanymusic)",
+                    duration: 371,
+                    artist: [],
+                    date: new Date(1660773600000),
+                };
+                const result = await youtubedlService.getSongInfo(input, console.log);
+                sortOfDeepEqual(result, expected);
             });
         });
         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 = {