diff --git a/README.md b/README.md index fdfba5d9..d22400ec 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ services: ### Node.js **Prerequisites**: -* Node.js (18.17.0 or later is required and latest 18.x.x LTS is recommended) +* Node.js (18.17.0 or latest 18.xx.xx is required and latest 18.x.x LTS is recommended) (Version 18 due to opus dependency) * ffmpeg (4.1 or later) 1. `git clone /~https://github.com/museofficial/muse.git && cd muse` diff --git a/package.json b/package.json index d588e79f..7fc56b9e 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "@discordjs/opus": "^0.8.0", "@discordjs/rest": "1.0.1", "@discordjs/voice": "0.17.0", - "@distube/ytdl-core": "^4.14.8", + "@distube/ytdl-core": "^4.15.9", "@distube/ytsr": "^2.0.4", "@prisma/client": "4.16.0", "@types/libsodium-wrappers": "^0.7.9", @@ -100,7 +100,7 @@ "discord.js": "14.11.0", "dotenv": "^16.4.5", "execa": "^6.1.0", - "fluent-ffmpeg": "^2.1.2", + "fluent-ffmpeg": "^2.1.3", "fs-capacitor": "^7.0.1", "get-youtube-id": "^1.0.1", "got": "^12.0.2", diff --git a/src/services/player.ts b/src/services/player.ts index 99ac8f07..d2c2f920 100644 --- a/src/services/player.ts +++ b/src/services/player.ts @@ -515,7 +515,7 @@ export default class { if (!ffmpegInput) { // Not yet cached, must download - const info = await ytdl.getInfo(song.url, {playerClients: ['WEB_CREATOR', 'IOS']}); + const info = await ytdl.getInfo(song.url); const formats = info.formats as YTDLVideoFormat[]; diff --git a/yarn.lock b/yarn.lock index d707cd79..e56451e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -152,19 +152,20 @@ tslib "^2.5.0" ws "^8.13.0" -"@distube/ytdl-core@^4.14.4": - version "4.14.4" - resolved "https://registry.npmjs.org/@distube/ytdl-core/-/ytdl-core-4.14.4.tgz" - integrity sha512-dHb4GW3qATIjRsS6VIhm3Pop7FdUcDFhsnyQlsPeXW7UhTPuNS0BmraKiTpFbpp0Ky+rxBQjJBfPRFsM+dT1fg== +"@distube/ytdl-core@^4.15.9": + version "4.15.9" + resolved "https://registry.npmjs.org/@distube/ytdl-core/-/ytdl-core-4.15.9.tgz" + integrity sha512-8rFL1NAMsYz4t7Ryaz09Ld7VgoBurGB0KECG8BpTR2vikN0gD1VVusdfZqTYK/gp7uj/TbTJBa85oMCiVXvxcA== dependencies: - http-cookie-agent "^6.0.5" + http-cookie-agent "^6.0.8" + https-proxy-agent "^7.0.6" m3u8stream "^0.8.6" miniget "^4.2.3" sax "^1.4.1" tough-cookie "^4.1.4" undici five -"@distube/ytsr@^2.0.0": +"@distube/ytsr@^2.0.4": version "2.0.4" resolved "https://registry.npmjs.org/@distube/ytsr/-/ytsr-2.0.4.tgz" integrity sha512-OiSWgARQ9LTj+dXt3jmMFzUH4l86VVCD4dVC4hEHNXdqp+DyU4QEzc+W6YY6//kWkvzTaUxOo7JUY7lBzwIF0A== @@ -723,12 +724,10 @@ agent-base@6, agent-base@^6.0.0, agent-base@^6.0.2: dependencies: debug "4" -agent-base@^7.1.1: - version "7.1.1" - resolved "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz" - integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA== - dependencies: - debug "^4.3.4" +agent-base@^7.1.2, agent-base@^7.1.3: + version "7.1.3" + resolved "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz" + integrity sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw== ajv@^6.10.0, ajv@^6.12.4: version "6.12.6" @@ -919,10 +918,10 @@ async-retry@1.3.3: dependencies: retry "0.13.1" -async@>=0.2.9: - version "3.2.3" - resolved "https://registry.npmjs.org/async/-/async-3.2.3.tgz" - integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g== +async@^0.2.9: + version "0.2.10" + resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" + integrity sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ== asynckit@^0.4.0: version "0.4.0" @@ -1330,13 +1329,6 @@ debug@^3.2.7: dependencies: ms "^2.1.1" -debug@^4.3.4: - version "4.3.5" - resolved "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz" - integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg== - dependencies: - ms "2.1.2" - decode-uri-component@^0.2.0: version "0.2.0" resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz" @@ -1741,7 +1733,7 @@ esbuild-linux-32@0.15.5: esbuild-linux-64@0.15.5: version "0.15.5" - resolved "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.5.tgz" + resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.5.tgz#6d748564492d5daaa7e62420862c31ac3a44aed9" integrity sha512-ne0GFdNLsm4veXbTnYAWjbx3shpNKZJUd6XpNbKNUZaNllDZfYQt0/zRqOg0sc7O8GQ+PjSMv9IpIEULXVTVmg== esbuild-linux-arm64@0.15.5: @@ -1796,7 +1788,7 @@ esbuild-windows-32@0.15.5: esbuild-windows-64@0.15.5: version "0.15.5" - resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.5.tgz#64f32acb7341f3f0a4d10e8ff1998c2d1ebfc0a9" + resolved "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.5.tgz" integrity sha512-v+PjvNtSASHOjPDMIai9Yi+aP+Vwox+3WVdg2JB8N9aivJ7lyhp4NVU+J0MV2OkWFPnVO8AE/7xH+72ibUUEnw== esbuild-windows-arm64@0.15.5: @@ -2034,7 +2026,7 @@ esutils@^2.0.2: eventemitter3@^4.0.7: version "4.0.7" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== execa@5.1.1: @@ -2213,12 +2205,12 @@ flatted@^3.1.0: resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz" integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg== -fluent-ffmpeg@^2.1.2: - version "2.1.2" - resolved "https://registry.npmjs.org/fluent-ffmpeg/-/fluent-ffmpeg-2.1.2.tgz" - integrity sha1-yVLeIkD4EuvaCqgAbXd27irPfXQ= +fluent-ffmpeg@^2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/fluent-ffmpeg/-/fluent-ffmpeg-2.1.3.tgz#d6846be257777844249a4adeb320f25326d239f3" + integrity sha512-Be3narBNt2s6bsaqP6Jzq91heDgOEaDCJAXcE3qcma/EJBSy5FB4cvO31XBInuAuKBx8Kptf8dkhjK0IOru39Q== dependencies: - async ">=0.2.9" + async "^0.2.9" which "^1.1.1" follow-redirects@^1.15.6: @@ -2646,12 +2638,12 @@ http-cache-semantics@^4.0.0: resolved "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz" integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== -http-cookie-agent@^6.0.5: - version "6.0.5" - resolved "https://registry.npmjs.org/http-cookie-agent/-/http-cookie-agent-6.0.5.tgz" - integrity sha512-sfZ8fDgDP3B1YB+teqSnAK1aPgBu8reUUGxSsndP2XnYN6cM29EURXWXZqQQiaRdor3B4QjpkUNfv21syaO4DA== +http-cookie-agent@^6.0.8: + version "6.0.8" + resolved "https://registry.npmjs.org/http-cookie-agent/-/http-cookie-agent-6.0.8.tgz" + integrity sha512-qnYh3yLSr2jBsTYkw11elq+T361uKAJaZ2dR4cfYZChw1dt9uL5t3zSUwehoqqVb4oldk1BpkXKm2oat8zV+oA== dependencies: - agent-base "^7.1.1" + agent-base "^7.1.3" http-errors@2.0.0: version "2.0.0" @@ -2689,6 +2681,14 @@ https-proxy-agent@5, https-proxy-agent@^5.0.0: agent-base "6" debug "4" +https-proxy-agent@^7.0.6: + version "7.0.6" + resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz" + integrity sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw== + dependencies: + agent-base "^7.1.2" + debug "4" + human-signals@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz" @@ -3839,7 +3839,7 @@ p-locate@^5.0.0: p-queue@7.1.0: version "7.1.0" - resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-7.1.0.tgz#c2bb28f8dc0ebf3fadb985b8706cf2ce5fe5f275" + resolved "https://registry.npmjs.org/p-queue/-/p-queue-7.1.0.tgz" integrity sha512-V+0vPJbhYkBqknPp0qnaz+dWcj8cNepfXZcsVIVEHPbFQXMPwrzCNIiM4FoxGtwHXtPzVCPHDvqCr1YrOJX2Gw== dependencies: eventemitter3 "^4.0.7" @@ -3856,7 +3856,7 @@ p-retry@6.2.0: p-timeout@^5.0.0: version "5.1.0" - resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-5.1.0.tgz#b3c691cf4415138ce2d9cfe071dba11f0fee085b" + resolved "https://registry.npmjs.org/p-timeout/-/p-timeout-5.1.0.tgz" integrity sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew== p-timeout@^5.0.2: @@ -4225,10 +4225,10 @@ rechoir@^0.6.2: dependencies: resolve "^1.1.6" -reflect-metadata@^0.1.13: - version "0.1.13" - resolved "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz" - integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg== +reflect-metadata@^0.2.2: + version "0.2.2" + resolved "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz" + integrity sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q== regexp.prototype.flags@^1.5.2: version "1.5.2" @@ -5037,7 +5037,7 @@ type-fest@^2.0.0: type-fest@^2.12.0: version "2.19.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b" + resolved "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz" integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA== typed-array-buffer@^1.0.2: