mix parser fallback strategy

twlite · Oct 23, 2023 · d564803 · d564803
1 parent 95b7b7a
commit d564803
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "youtube-sr",
-  "version": "4.3.8",
+  "version": "4.3.9",
   "description": "Simple package to make YouTube search.",
   "files": [
     "dist"

diff --git a/src/Structures/Playlist.ts b/src/Structures/Playlist.ts
@@ -40,6 +40,7 @@ export class Playlist {
     thumbnail?: Thumbnail;
     videos: Video[];
     mix?: boolean;
+    fake = false;
     private _continuation: { api?: string; token?: string; clientVersion?: string } = {};
 
     constructor(data = {}, searchResult = false) {
@@ -55,15 +56,16 @@ export class Playlist {
         this.videoCount = data.videoCount || 0;
         this.lastUpdate = data.lastUpdate || null;
         this.views = data.views || 0;
-        this.url = data.url || null;
-        this.link = data.link || null;
+        this.url = data.url || data.link || this.id ? `https://www.youtube.com/playlist?list=${this.id}` : null;
+        this.link = data.link || data.url || null;
         this.channel = data.author || null;
         this.thumbnail = new Thumbnail(data.thumbnail || {});
         this.videos = data.videos || [];
         this._continuation.api = data.continuation?.api ?? null;
         this._continuation.token = data.continuation?.token ?? null;
         this._continuation.clientVersion = data.continuation?.clientVersion ?? "<important data>";
         this.mix = data.mix || false;
+        this.fake = Boolean(data.fake);
     }
 
     private _patchSearch(data: any) {
@@ -73,10 +75,12 @@ export class Playlist {
         this.channel = data.channel || null;
         this.videos = data.videos || [];
         this.videoCount = data.videos?.length || 0;
-        this.url = this.id ? `https://www.youtube.com/playlist?list=${this.id}` : null;
-        this.link = data.link || null;
+        this.url = data.url || data.link || this.id ? `https://www.youtube.com/playlist?list=${this.id}` : null;
+        this.link = data.link || data.url || null;
         this.lastUpdate = null;
         this.views = 0;
+        this.mix = data.mix || false;
+        this.fake = Boolean(data.fake);
     }
 
     /**
@@ -144,6 +148,7 @@ export class Playlist {
                 id: this.channel.id,
                 icon: this.channel?.iconURL?.()
             },
+            mix: this.mix,
             url: this.url,
             videos: this.videos
         };

diff --git a/src/Util.ts b/src/Util.ts
@@ -555,7 +555,8 @@ class Util {
                 thumbnail: videos[0]?.thumbnail?.toJSON() || null,
                 channel: {
                     name: data.ownerName.simpleText
-                }
+                },
+                mix: true
             },
             true
         );

diff --git a/src/mod.ts b/src/mod.ts
@@ -144,6 +144,40 @@ class YouTube {
         const html = await Util.getHTML(`${url}&hl=en`, options && options.requestOptions);
         const res = resolved.mix ? Util.getMix(html) : Util.getPlaylist(html, options && options.limit);
 
+        // fallback
+        try {
+            if (!res && resolved.mix) {
+                const videoId = new URL(url).searchParams.get("v");
+                if (videoId) {
+                    const vid: Video = await YouTube.getVideo(`https://www.youtube.com/watch?v=${videoId}`).catch(() => null);
+                    if (vid) {
+                        // return fake playlist when mix could not be parsed
+                        return new Playlist(
+                            {
+                                id: vid.id,
+                                title: `Mix - ${vid.title}`,
+                                videoCount: 1,
+                                lastUpdate: null,
+                                views: vid.views,
+                                url: `https://www.youtube.com/watch?v=${vid.id}`,
+                                link: `https://www.youtube.com/watch?v=${vid.id}`,
+                                channel: {
+                                    name: "youtube-sr"
+                                },
+                                thumbnail: vid.thumbnail?.toJSON() || null,
+                                videos: [vid],
+                                mix: true,
+                                fake: true
+                            },
+                            true
+                        );
+                    }
+                }
+            }
+        } catch {
+            //
+        }
+
         if (res && res instanceof Playlist && options.fetchAll) {
             return await res.fetch(options && options.limit).catch(() => res);
         }