vdj 1.6.10 → 1.7.1

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

@@ -5,6 +5,7 @@ export default class YouTubeService implements IService {
     readonly api: API;
     canSearch: boolean;
     type: string;
+    private innertubePromise;
     constructor(key: string);
     fetch(targets: string[], logger?: Logger): Promise<YouTubeSong[]>;
     search(queries: string[], searchType: SearchType, logger?: Logger): Promise<YouTubeSong[]>;

package/dist/default_implementations/youtube/service.js

@@ -13,12 +13,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const API = require("simple-youtube-api");
-const ytdl = require("@distube/ytdl-core");
+const youtubei_js_1 = require("youtubei.js");
 const song_1 = __importDefault(require("./song"));
 class YouTubeService {
     constructor(key) {
         this.canSearch = true;
         this.type = 'youtube';
+        this.innertubePromise = youtubei_js_1.Innertube.create();
         this.api = new API(key);
     }
     fetch(targets, logger) {
@@ -78,17 +79,24 @@ class YouTubeService {
     }
     getSongInfo(url, logger) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d;
+            function url_parser(url) {
+                var regExp = /^.*((youtu.be\/)|(v\/)|(\/u\/\w\/)|(embed\/)|(watch\?))\??v?=?([^#&?]*).*/;
+                var match = url.match(regExp);
+                return (match && match[7].length == 11) ? match[7] : url;
+            }
             try {
-                const result = yield ytdl.getInfo(url);
+                const innertube = yield this.innertubePromise;
+                const result = yield innertube.getBasicInfo(url_parser(url));
                 return {
                     full: true,
                     metadataType: "youtube",
-                    imgURL: result.player_response.videoDetails.thumbnail.thumbnails[0].url,
-                    title: result.videoDetails.title,
-                    duration: Number(result.videoDetails.lengthSeconds),
-                    url: result.videoDetails.video_url,
-                    artist: [result.videoDetails.author.name],
-                    date: new Date(result.videoDetails.publishDate),
+                    imgURL: (_c = (_b = (_a = result.basic_info) === null || _a === void 0 ? void 0 : _a.thumbnail) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.url,
+                    title: result.basic_info.title,
+                    duration: result.basic_info.duration ? Number(result.basic_info.duration) : undefined,
+                    url: (_d = result.basic_info.url_canonical) !== null && _d !== void 0 ? _d : url,
+                    artist: result.basic_info.author ? [result.basic_info.author] : undefined,
+                    date: undefined,
                     custom: result
                 };
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vdj",
-  "version": "1.6.10",
+  "version": "1.7.1",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -15,11 +15,11 @@
     "typescript": "^5.7.3"
   },
   "dependencies": {
-    "@distube/ytdl-core": "^4.16.12",
     "@types/node": "^12.19.2",
     "got": "^13.0.0",
     "mocha": "^10.7.3",
     "simple-youtube-api": "^5.2.1",
-    "youtube-dl-exec": "^3.0.22"
+    "youtube-dl-exec": "^3.0.30",
+    "youtubei.js": "^16.0.1"
   }
 }

package/src/default_implementations/youtube/service.ts

@@ -1,14 +1,17 @@
 import API = require('simple-youtube-api');
-import ytdl = require("@distube/ytdl-core");
+import { Innertube, Generator } from 'youtubei.js';
 
 import { IService, SearchType, SongInfo, Logger } from '../../core/';
 import YouTubeSong from './song';
+import { VideoInfo } from 'youtubei.js/dist/src/parser/youtube';
 
 export default class YouTubeService implements IService {
     public readonly api: API;
     public canSearch: boolean = true;
     public type: string = 'youtube';
 
+    private innertubePromise = Innertube.create();
+
     constructor(key: string) {
         this.api = new API(key);
     }
@@ -67,18 +70,25 @@ export default class YouTubeService implements IService {
         return parsed.video != undefined || parsed.playlist != undefined;
     }
 
-    public async getSongInfo(url: string, logger?: Logger): Promise<SongInfo> {
+    public async getSongInfo(url: string, logger?: Logger): Promise<SongInfo> {        
+        function url_parser(url: string): string {
+            var regExp = /^.*((youtu.be\/)|(v\/)|(\/u\/\w\/)|(embed\/)|(watch\?))\??v?=?([^#&?]*).*/;
+            var match = url.match(regExp);
+            return (match && match[7].length == 11) ? match[7] : url;
+        }
+
         try {
-            const result: ytdl.videoInfo = await ytdl.getInfo(url);
+            const innertube = await this.innertubePromise;
+            const result: VideoInfo = await innertube.getBasicInfo(url_parser(url));            
             return {
                 full: true,
                 metadataType: "youtube",
-                imgURL: ((result.player_response.videoDetails as any).thumbnail as ytdl.VideoDetails).thumbnails[0].url,
-                title: result.videoDetails.title,
-                duration: Number(result.videoDetails.lengthSeconds),
-                url: result.videoDetails.video_url,
-                artist: [result.videoDetails.author.name],
-                date: new Date(result.videoDetails.publishDate),
+                imgURL: result.basic_info?.thumbnail?.[0]?.url,
+                title: result.basic_info.title,
+                duration: result.basic_info.duration ? Number(result.basic_info.duration) : undefined,
+                url: result.basic_info.url_canonical ?? url,
+                artist: result.basic_info.author ? [result.basic_info.author] : undefined,
+                date: undefined,
                 custom: result
             };
         } catch (e) {

package/test/test.js

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