vdj 1.4.7 → 1.6.0

package/dist/default_implementations/youtubedl/song.js

@@ -1,46 +1,46 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    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) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("../../core");
-const youtube_dl_exec_1 = require("youtube-dl-exec");
-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() {
-        const stream = youtube_dl_exec_1.exec(this.streamURL, {
-            output: '-',
-            format: 'bestaudio/best',
-            limitRate: '1M',
-            rmCacheDir: true,
-            verbose: true,
-        }, { stdio: ['ignore', 'pipe', 'ignore'] });
-        return stream.stdout;
-    }
-}
-exports.default = YoutubedlSong;
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    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) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("../../core");
+const youtube_dl_exec_1 = require("youtube-dl-exec");
+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() {
+        const stream = (0, youtube_dl_exec_1.exec)(this.streamURL, {
+            output: '-',
+            format: 'bestaudio/best',
+            limitRate: '1M',
+            rmCacheDir: true,
+            verbose: true,
+        }, { stdio: ['ignore', 'pipe', 'ignore'] });
+        return stream.stdout;
+    }
+}
+exports.default = YoutubedlSong;

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-import { Playlist, PlaylistSettings, IService, Song, SongInfo, PlaylistAddType, SearchType } from './core';
-import YouTubeService from './default_implementations/youtube/service';
-import YouTubeSong from './default_implementations/youtube/song';
-import YoutubedlService from './default_implementations/youtubedl/service';
-import YoutubedlSong from './default_implementations/youtubedl/song';
-export { Playlist, PlaylistSettings, SearchType, PlaylistAddType, IService, Song, SongInfo, YouTubeService, YouTubeSong, YoutubedlService, YoutubedlSong, };
+import { Playlist, PlaylistSettings, IService, Song, SongInfo, PlaylistAddType, SearchType } from './core';
+import YouTubeService from './default_implementations/youtube/service';
+import YouTubeSong from './default_implementations/youtube/song';
+import YoutubedlService from './default_implementations/youtubedl/service';
+import YoutubedlSong from './default_implementations/youtubedl/song';
+export { Playlist, PlaylistSettings, SearchType, PlaylistAddType, IService, Song, SongInfo, YouTubeService, YouTubeSong, YoutubedlService, YoutubedlSong, };

package/dist/index.js

@@ -1,17 +1,17 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.YoutubedlSong = exports.YoutubedlService = exports.YouTubeSong = exports.YouTubeService = exports.Song = exports.Playlist = void 0;
-const core_1 = require("./core");
-Object.defineProperty(exports, "Playlist", { enumerable: true, get: function () { return core_1.Playlist; } });
-Object.defineProperty(exports, "Song", { enumerable: true, get: function () { return core_1.Song; } });
-const service_1 = __importDefault(require("./default_implementations/youtube/service"));
-exports.YouTubeService = service_1.default;
-const song_1 = __importDefault(require("./default_implementations/youtube/song"));
-exports.YouTubeSong = song_1.default;
-const service_2 = __importDefault(require("./default_implementations/youtubedl/service"));
-exports.YoutubedlService = service_2.default;
-const song_2 = __importDefault(require("./default_implementations/youtubedl/song"));
-exports.YoutubedlSong = song_2.default;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.YoutubedlSong = exports.YoutubedlService = exports.YouTubeSong = exports.YouTubeService = exports.Song = exports.Playlist = void 0;
+const core_1 = require("./core");
+Object.defineProperty(exports, "Playlist", { enumerable: true, get: function () { return core_1.Playlist; } });
+Object.defineProperty(exports, "Song", { enumerable: true, get: function () { return core_1.Song; } });
+const service_1 = __importDefault(require("./default_implementations/youtube/service"));
+exports.YouTubeService = service_1.default;
+const song_1 = __importDefault(require("./default_implementations/youtube/song"));
+exports.YouTubeSong = song_1.default;
+const service_2 = __importDefault(require("./default_implementations/youtubedl/service"));
+exports.YoutubedlService = service_2.default;
+const song_2 = __importDefault(require("./default_implementations/youtubedl/song"));
+exports.YoutubedlSong = song_2.default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vdj",
-  "version": "1.4.7",
+  "version": "1.6.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -12,14 +12,14 @@
   "devDependencies": {
     "chai": "^4.2.0",
     "dotenv": "^8.2.0",
-    "mocha": "^10.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": "^2.4.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/youtubedl/service.ts

@@ -21,6 +21,19 @@ 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 }, {});
+        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",
@@ -28,7 +41,7 @@ export default class YoutubedlService implements IService {
             title: res.title || url,
             duration: res.duration,
             url: url,
-            artist: res.artist ? [res.artist] : [],
+            artist: [],
             date: this.parseDate(res.upload_date),
             custom: {}
         };

package/test/test.js

@@ -128,7 +128,7 @@ describe("Playlist", function () {
                     title: "楽園ベイベー - RIP SLYME(Cover) / KMNZ",
                     duration: 282,
                     artist: ["KMNZ"],
-                    date: new Date(1566950400000),
+                    date: new Date(1566991937000),
                 };
                 const result = await youtubeService.getSongInfo(input, console.log);
                 sortOfDeepEqual(result, expected);