fix: change ytdl provider

EvolutionX-10 · Oct 11, 2024 · 565d984 · 565d984
1 parent 7fe9868
commit 565d984
Show file tree

Hide file tree

Showing 4 changed files with 125 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -82,6 +82,7 @@
 		"typescript": "5.5.3"
 	},
 	"dependencies": {
+		"@distube/ytdl-core": "^4.14.4",
 		"@ffmpeg-installer/ffmpeg": "^1.1.0",
 		"cli-progress": "3.12.0",
 		"colorette": "2.0.20",
@@ -93,8 +94,7 @@
 		"ora": "8.0.1",
 		"sanitize-filename": "1.6.3",
 		"undici": "6.19.2",
-		"youtube-sr": "4.3.11",
-		"ytdl-core": "4.11.5"
+		"youtube-sr": "4.3.11"
 	},
 	"prettier": "@sapphire/prettier-config"
 }
diff --git a/src/utils/music.ts b/src/utils/music.ts
@@ -8,7 +8,7 @@ import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import sanitize from 'sanitize-filename';
 import { request } from 'undici';
-import ytdl from 'ytdl-core';
+import ytdl from '@distube/ytdl-core';
 import { YouTube, Video } from 'youtube-sr';
 import { getConfig, musicPath } from './config.js';
 import { searchSpotify } from './spotify.js';

diff --git a/src/utils/saveAlbum.ts b/src/utils/saveAlbum.ts
@@ -8,7 +8,7 @@ import { tmpdir } from 'os';
 import { join } from 'path';
 import sanitize from 'sanitize-filename';
 import { request } from 'undici';
-import ytdl from 'ytdl-core';
+import ytdl from '@distube/ytdl-core';
 import type { Video } from 'youtube-sr';
 import { getConfig, musicPath } from './config.js';
 import { wait } from './functions.js';

diff --git a/yarn.lock b/yarn.lock
@@ -12,6 +12,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@distube/ytdl-core@npm:^4.14.4":
+  version: 4.14.4
+  resolution: "@distube/ytdl-core@npm:4.14.4"
+  dependencies:
+    http-cookie-agent: ^6.0.5
+    m3u8stream: ^0.8.6
+    miniget: ^4.2.3
+    sax: ^1.4.1
+    tough-cookie: ^4.1.4
+    undici: five
+  checksum: c53d0e3366eea7a9e9b0461fe6b454423fa8d2389a6b427e9cea93b9fbad2508d312588a609d47afbe2b0de72568e59b4e41274883f7f584cc9e2ba0eb9852da
+  languageName: node
+  linkType: hard
+
 "@esbuild/aix-ppc64@npm:0.21.5":
   version: 0.21.5
   resolution: "@esbuild/aix-ppc64@npm:0.21.5"
@@ -257,6 +271,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@fastify/busboy@npm:^2.0.0":
+  version: 2.1.1
+  resolution: "@fastify/busboy@npm:2.1.1"
+  checksum: 42c32ef75e906c9a4809c1e1930a5ca6d4ddc8d138e1a8c8ba5ea07f997db32210617d23b2e4a85fe376316a41a1a0439fc6ff2dedf5126d96f45a9d80754fb2
+  languageName: node
+  linkType: hard
+
 "@favware/cliff-jumper@npm:3.0.3":
   version: 3.0.3
   resolution: "@favware/cliff-jumper@npm:3.0.3"
@@ -1077,6 +1098,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"agent-base@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "agent-base@npm:7.1.1"
+  dependencies:
+    debug: ^4.3.4
+  checksum: 51c158769c5c051482f9ca2e6e1ec085ac72b5a418a9b31b4e82fe6c0a6699adb94c1c42d246699a587b3335215037091c79e0de512c516f73b6ea844202f037
+  languageName: node
+  linkType: hard
+
 "agentkeepalive@npm:^4.2.1":
   version: 4.5.0
   resolution: "agentkeepalive@npm:4.5.0"
@@ -1220,6 +1250,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "ariaa@workspace:."
   dependencies:
+    "@distube/ytdl-core": ^4.14.4
     "@favware/cliff-jumper": 3.0.3
     "@favware/npm-deprecate": 1.0.7
     "@ffmpeg-installer/ffmpeg": ^1.1.0
@@ -1251,7 +1282,6 @@ __metadata:
     typescript: 5.5.3
     undici: 6.19.2
     youtube-sr: 4.3.11
-    ytdl-core: 4.11.5
   bin:
     aria: ./dist/index.js
     ariaa: ./dist/index.js
@@ -2712,6 +2742,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"http-cookie-agent@npm:^6.0.5":
+  version: 6.0.6
+  resolution: "http-cookie-agent@npm:6.0.6"
+  dependencies:
+    agent-base: ^7.1.1
+  peerDependencies:
+    tough-cookie: ^4.0.0 || ^5.0.0
+    undici: ^5.11.0 || ^6.0.0
+  peerDependenciesMeta:
+    undici:
+      optional: true
+  checksum: 57314b3f03c312a9a1e8a4b00fb6834daa1c06bd893ae5b416bd58e8826d8bf2568b4ed72ead2817b0981349cbcb3e668e5d43c6da840704e311d5b7c00499c4
+  languageName: node
+  linkType: hard
+
 "http-proxy-agent@npm:^5.0.0":
   version: 5.0.0
   resolution: "http-proxy-agent@npm:5.0.0"
@@ -3296,7 +3341,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"miniget@npm:^4.2.2":
+"miniget@npm:^4.2.2, miniget@npm:^4.2.3":
   version: 4.2.3
   resolution: "miniget@npm:4.2.3"
   checksum: c2db18570b4dc6771a6824993f9a33360b02ef92173bf38a5d772f27640f4f493153f73da1b28700c2b55cb7526321446ce2f326c667ad671fb78c8998c1402f
@@ -3935,13 +3980,34 @@ __metadata:
   languageName: node
   linkType: hard
 
+"psl@npm:^1.1.33":
+  version: 1.9.0
+  resolution: "psl@npm:1.9.0"
+  checksum: 20c4277f640c93d393130673f392618e9a8044c6c7bf61c53917a0fddb4952790f5f362c6c730a9c32b124813e173733f9895add8d26f566ed0ea0654b2e711d
+  languageName: node
+  linkType: hard
+
 "punycode@npm:^2.1.0":
   version: 2.3.0
   resolution: "punycode@npm:2.3.0"
   checksum: 39f760e09a2a3bbfe8f5287cf733ecdad69d6af2fe6f97ca95f24b8921858b91e9ea3c9eeec6e08cede96181b3bb33f95c6ffd8c77e63986508aa2e8159fa200
   languageName: node
   linkType: hard
 
+"punycode@npm:^2.1.1":
+  version: 2.3.1
+  resolution: "punycode@npm:2.3.1"
+  checksum: bb0a0ceedca4c3c57a9b981b90601579058903c62be23c5e8e843d2c2d4148a3ecf029d5133486fb0e1822b098ba8bba09e89d6b21742d02fa26bda6441a6fb2
+  languageName: node
+  linkType: hard
+
+"querystringify@npm:^2.1.1":
+  version: 2.2.0
+  resolution: "querystringify@npm:2.2.0"
+  checksum: 5641ea231bad7ef6d64d9998faca95611ed4b11c2591a8cae741e178a974f6a8e0ebde008475259abe1621cb15e692404e6b6626e927f7b849d5c09392604b15
+  languageName: node
+  linkType: hard
+
 "queue-microtask@npm:^1.2.2":
   version: 1.2.3
   resolution: "queue-microtask@npm:1.2.3"
@@ -3984,6 +4050,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"requires-port@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "requires-port@npm:1.0.0"
+  checksum: eee0e303adffb69be55d1a214e415cf42b7441ae858c76dfc5353148644f6fd6e698926fc4643f510d5c126d12a705e7c8ed7e38061113bdf37547ab356797ff
+  languageName: node
+  linkType: hard
+
 "resolve-from@npm:^4.0.0":
   version: 4.0.0
   resolution: "resolve-from@npm:4.0.0"
@@ -4196,13 +4269,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sax@npm:^1.1.3, sax@npm:^1.2.4":
+"sax@npm:^1.2.4":
   version: 1.2.4
   resolution: "sax@npm:1.2.4"
   checksum: d3df7d32b897a2c2f28e941f732c71ba90e27c24f62ee918bd4d9a8cfb3553f2f81e5493c7f0be94a11c1911b643a9108f231dd6f60df3fa9586b5d2e3e9e1fe
   languageName: node
   linkType: hard
 
+"sax@npm:^1.4.1":
+  version: 1.4.1
+  resolution: "sax@npm:1.4.1"
+  checksum: 3ad64df16b743f0f2eb7c38ced9692a6d924f1cd07bbe45c39576c2cf50de8290d9d04e7b2228f924c7d05fecc4ec5cf651423278e0c7b63d260c387ef3af84a
+  languageName: node
+  linkType: hard
+
 "semver@npm:^7.0.0, semver@npm:^7.3.5, semver@npm:^7.5.2, semver@npm:^7.6.0":
   version: 7.6.0
   resolution: "semver@npm:7.6.0"
@@ -4570,6 +4650,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tough-cookie@npm:^4.1.4":
+  version: 4.1.4
+  resolution: "tough-cookie@npm:4.1.4"
+  dependencies:
+    psl: ^1.1.33
+    punycode: ^2.1.1
+    universalify: ^0.2.0
+    url-parse: ^1.5.3
+  checksum: 5815059f014c31179a303c673f753f7899a6fce94ac93712c88ea5f3c26e0c042b5f0c7a599a00f8e0feeca4615dba75c3dffc54f3c1a489978aa8205e09307c
+  languageName: node
+  linkType: hard
+
 "tr46@npm:^1.0.1":
   version: 1.0.1
   resolution: "tr46@npm:1.0.1"
@@ -4750,6 +4842,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"undici@npm:five":
+  version: 5.28.4
+  resolution: "undici@npm:5.28.4"
+  dependencies:
+    "@fastify/busboy": ^2.0.0
+  checksum: a8193132d84540e4dc1895ecc8dbaa176e8a49d26084d6fbe48a292e28397cd19ec5d13bc13e604484e76f94f6e334b2bdc740d5f06a6e50c44072818d0c19f9
+  languageName: node
+  linkType: hard
+
 "unique-filename@npm:^3.0.0":
   version: 3.0.0
   resolution: "unique-filename@npm:3.0.0"
@@ -4768,6 +4869,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"universalify@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "universalify@npm:0.2.0"
+  checksum: e86134cb12919d177c2353196a4cc09981524ee87abf621f7bc8d249dbbbebaec5e7d1314b96061497981350df786e4c5128dbf442eba104d6e765bc260678b5
+  languageName: node
+  linkType: hard
+
 "uri-js@npm:^4.2.2":
   version: 4.4.1
   resolution: "uri-js@npm:4.4.1"
@@ -4777,6 +4885,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"url-parse@npm:^1.5.3":
+  version: 1.5.10
+  resolution: "url-parse@npm:1.5.10"
+  dependencies:
+    querystringify: ^2.1.1
+    requires-port: ^1.0.0
+  checksum: fbdba6b1d83336aca2216bbdc38ba658d9cfb8fc7f665eb8b17852de638ff7d1a162c198a8e4ed66001ddbf6c9888d41e4798912c62b4fd777a31657989f7bdf
+  languageName: node
+  linkType: hard
+
 "utf8-byte-length@npm:^1.0.1":
   version: 1.0.4
   resolution: "utf8-byte-length@npm:1.0.4"
@@ -4951,14 +5069,3 @@ __metadata:
   checksum: 05f3f237acd46b71d1ff3bae53c93324af8bbe20442430b921c0a56d03860500924365e3726b364004aebb668651c5e852580918c37bd8aef4b643becb535db0
   languageName: node
   linkType: hard
-
-"ytdl-core@npm:4.11.5":
-  version: 4.11.5
-  resolution: "ytdl-core@npm:4.11.5"
-  dependencies:
-    m3u8stream: ^0.8.6
-    miniget: ^4.2.2
-    sax: ^1.1.3
-  checksum: f81ae907780747c4522198003967da1730af33fb6c8632ed2ba7a3dfb67a3fd1bf73807a68506a5926d209ee2f3305bfb6a633f6829b39ed60694c033c300fa9
-  languageName: node
-  linkType: hard