diff --git a/.dockerignore b/.dockerignore index 1732e0c..37aa81b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -13,6 +13,7 @@ scripts docker-compose.yml Dockerfile Dockerfile.cache +dprint.json eslint.config.mjs nodemon-js.json nodemon-swc.json diff --git a/Dockerfile b/Dockerfile index 871016b..eb77bd5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,9 +3,9 @@ FROM node:21.7.3-alpine3.18 COPY --from=cache /cache/node_modules /app/node_modules COPY . /app - WORKDIR /app -ENV NODE_PATH=dist/ + +RUN apk add --no-cache ffmpeg RUN corepack enable RUN yarn build diff --git a/package.json b/package.json index 4e98bfa..3cb30cc 100644 --- a/package.json +++ b/package.json @@ -46,8 +46,7 @@ "pg": "^8.13.0", "pg-hstore": "^2.3.4", "pretty-ms": "^9.1.0", - "sequelize": "^6.37.3", - "youtube-ext": "^1.1.25" + "sequelize": "^6.37.3" }, "devDependencies": { "@eslint/eslintrc": "^3.1.0", diff --git a/yarn.lock b/yarn.lock index b798e85..315d0b1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5,6 +5,13 @@ __metadata: version: 8 cacheKey: 10c0 +"@bufbuild/protobuf@npm:^2.0.0": + version: 2.1.0 + resolution: "@bufbuild/protobuf@npm:2.1.0" + checksum: 10c0/d2e3b84ea1da284b6085ac2adb9bc7e51ef5d275587991fc67b431262a7b56876ea7a197d9b9b689f50b4c16ebb1225b870352c672224066f92e671258c417e1 + languageName: node + linkType: hard + "@discord-player/equalizer@npm:^0.2.3": version: 0.2.3 resolution: "@discord-player/equalizer@npm:0.2.3" @@ -1202,16 +1209,6 @@ __metadata: languageName: node linkType: hard -"anymatch@npm:~3.1.2": - version: 3.1.3 - resolution: "anymatch@npm:3.1.3" - dependencies: - normalize-path: "npm:^3.0.0" - picomatch: "npm:^2.0.4" - checksum: 10c0/57b06ae984bc32a0d22592c87384cd88fe4511b1dd7581497831c56d41939c8a001b28e7b853e1450f2bf61992dfcaa8ae2d0d161a0a90c4fb631ef07098fbac - languageName: node - linkType: hard - "aproba@npm:^1.0.3 || ^2.0.0": version: 2.0.0 resolution: "aproba@npm:2.0.0" @@ -1306,13 +1303,6 @@ __metadata: languageName: node linkType: hard -"binary-extensions@npm:^2.0.0": - version: 2.3.0 - resolution: "binary-extensions@npm:2.3.0" - checksum: 10c0/75a59cafc10fb12a11d510e77110c6c7ae3f4ca22463d52487709ca7f18f69d886aa387557cc9864fbdb10153d0bdb4caacabf11541f55e89ed6e18d12ece2b5 - languageName: node - linkType: hard - "bindings@npm:^1.5.0": version: 1.5.0 resolution: "bindings@npm:1.5.0" @@ -1359,7 +1349,7 @@ __metadata: languageName: node linkType: hard -"braces@npm:^3.0.3, braces@npm:~3.0.2": +"braces@npm:^3.0.3": version: 3.0.3 resolution: "braces@npm:3.0.3" dependencies: @@ -1477,22 +1467,12 @@ __metadata: languageName: node linkType: hard -"chokidar@npm:^3.6.0": - version: 3.6.0 - resolution: "chokidar@npm:3.6.0" +"chokidar@npm:^4.0.0": + version: 4.0.0 + resolution: "chokidar@npm:4.0.0" dependencies: - anymatch: "npm:~3.1.2" - braces: "npm:~3.0.2" - fsevents: "npm:~2.3.2" - glob-parent: "npm:~5.1.2" - is-binary-path: "npm:~2.1.0" - is-glob: "npm:~4.0.1" - normalize-path: "npm:~3.0.0" - readdirp: "npm:~3.6.0" - dependenciesMeta: - fsevents: - optional: true - checksum: 10c0/8361dcd013f2ddbe260eacb1f3cb2f2c6f2b0ad118708a343a5ed8158941a39cb8fb1d272e0f389712e74ee90ce8ba864eece9e0e62b9705cb468a2f6d917462 + readdirp: "npm:^4.0.1" + checksum: 10c0/42d03c53b0ad200689e4fae7763133561480561cab8ba5304e8f2298ff45ff84bf0f6065c3f02b9e557b74b156813734439a1a2ff19a1ea6b35692395cd92738 languageName: node linkType: hard @@ -2470,7 +2450,7 @@ __metadata: languageName: node linkType: hard -"fsevents@npm:~2.3.2, fsevents@npm:~2.3.3": +"fsevents@npm:~2.3.3": version: 2.3.3 resolution: "fsevents@npm:2.3.3" dependencies: @@ -2480,7 +2460,7 @@ __metadata: languageName: node linkType: hard -"fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin, fsevents@patch:fsevents@npm%3A~2.3.3#optional!builtin": +"fsevents@patch:fsevents@npm%3A~2.3.3#optional!builtin": version: 2.3.3 resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin::version=2.3.3&hash=df0bf1" dependencies: @@ -2554,7 +2534,7 @@ __metadata: languageName: node linkType: hard -"glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.2": +"glob-parent@npm:^5.1.2": version: 5.1.2 resolution: "glob-parent@npm:5.1.2" dependencies: @@ -2794,7 +2774,7 @@ __metadata: anilist: "npm:^0.12.4" axios: "npm:^1.7.7" chalk: "npm:^5.3.0" - chokidar: "npm:^3.6.0" + chokidar: "npm:^4.0.0" cron: "npm:^3.1.7" discord-player: "npm:^6.7.1" discord-player-youtubei: "npm:^1.3.1" @@ -2813,7 +2793,6 @@ __metadata: sqlite3: "npm:^5.1.7" tsx: "npm:^4.19.1" typescript: "npm:^5.6.2" - youtube-ext: "npm:^1.1.25" languageName: unknown linkType: soft @@ -2906,15 +2885,6 @@ __metadata: languageName: node linkType: hard -"is-binary-path@npm:~2.1.0": - version: 2.1.0 - resolution: "is-binary-path@npm:2.1.0" - dependencies: - binary-extensions: "npm:^2.0.0" - checksum: 10c0/a16eaee59ae2b315ba36fad5c5dcaf8e49c3e27318f8ab8fa3cdb8772bf559c8d1ba750a589c2ccb096113bb64497084361a25960899cb6172a6925ab6123d38 - languageName: node - linkType: hard - "is-extglob@npm:^2.1.1": version: 2.1.1 resolution: "is-extglob@npm:2.1.1" @@ -2929,7 +2899,7 @@ __metadata: languageName: node linkType: hard -"is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:^4.0.3, is-glob@npm:~4.0.1": +"is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:^4.0.3": version: 4.0.3 resolution: "is-glob@npm:4.0.3" dependencies: @@ -3745,13 +3715,6 @@ __metadata: languageName: node linkType: hard -"normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0": - version: 3.0.0 - resolution: "normalize-path@npm:3.0.0" - checksum: 10c0/e008c8142bcc335b5e38cf0d63cfd39d6cf2d97480af9abdbe9a439221fd4d749763bab492a8ee708ce7a194bb00c9da6d0a115018672310850489137b3da046 - languageName: node - linkType: hard - "normalize-url@npm:^6.0.1": version: 6.1.0 resolution: "normalize-url@npm:6.1.0" @@ -4088,7 +4051,7 @@ __metadata: languageName: node linkType: hard -"picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.3.1": +"picomatch@npm:^2.3.1": version: 2.3.1 resolution: "picomatch@npm:2.3.1" checksum: 10c0/26c02b8d06f03206fc2ab8d16f19960f2ff9e81a658f831ecb656d8f17d9edc799e8364b1f4a7873e89d9702dff96204be0fa26fe4181f6843f040f819dac4be @@ -4343,12 +4306,10 @@ __metadata: languageName: node linkType: hard -"readdirp@npm:~3.6.0": - version: 3.6.0 - resolution: "readdirp@npm:3.6.0" - dependencies: - picomatch: "npm:^2.2.1" - checksum: 10c0/6fa848cf63d1b82ab4e985f4cf72bd55b7dcfd8e0a376905804e48c3634b7e749170940ba77b32804d5fe93b3cc521aa95a8d7e7d725f830da6d93f3669ce66b +"readdirp@npm:^4.0.1": + version: 4.0.1 + resolution: "readdirp@npm:4.0.1" + checksum: 10c0/e5a0b547015f68ecc918f115b62b75b2b840611480a9240cb3317090a0ddac01bb9b40315a8fa08acdf52a43eea17b808c89b645263cba3ab64dc557d7f801f1 languageName: node linkType: hard @@ -5024,20 +4985,20 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^2.5.0, tslib@npm:^2.6.1, tslib@npm:^2.6.2": - version: 2.6.3 - resolution: "tslib@npm:2.6.3" - checksum: 10c0/2598aef53d9dbe711af75522464b2104724d6467b26a60f2bdac8297d2b5f1f6b86a71f61717384aa8fd897240467aaa7bcc36a0700a0faf751293d1331db39a - languageName: node - linkType: hard - -"tslib@npm:^2.6.3": +"tslib@npm:^2.5.0, tslib@npm:^2.6.3": version: 2.7.0 resolution: "tslib@npm:2.7.0" checksum: 10c0/469e1d5bf1af585742128827000711efa61010b699cb040ab1800bcd3ccdd37f63ec30642c9e07c4439c1db6e46345582614275daca3e0f4abae29b0083f04a6 languageName: node linkType: hard +"tslib@npm:^2.6.1, tslib@npm:^2.6.2": + version: 2.6.3 + resolution: "tslib@npm:2.6.3" + checksum: 10c0/2598aef53d9dbe711af75522464b2104724d6467b26a60f2bdac8297d2b5f1f6b86a71f61717384aa8fd897240467aaa7bcc36a0700a0faf751293d1331db39a + languageName: node + linkType: hard + "tsx@npm:^4.19.1": version: 4.19.1 resolution: "tsx@npm:4.19.1" @@ -5120,7 +5081,7 @@ __metadata: languageName: node linkType: hard -"undici@npm:6.19.8, undici@npm:^6.11.1, undici@npm:^6.15.0, undici@npm:^6.17.0": +"undici@npm:6.19.8, undici@npm:^6.11.1, undici@npm:^6.17.0": version: 6.19.8 resolution: "undici@npm:6.19.8" checksum: 10c0/07fd8520bce7e34ea29c07ef0de27b734183042cdb4e2f1262cd1fb9b755a6b04ff2471040395dfb1770fb7786069a97c5178bcf706b80a34075994f46feb37c @@ -5382,15 +5343,6 @@ __metadata: languageName: node linkType: hard -"youtube-ext@npm:^1.1.25": - version: 1.1.25 - resolution: "youtube-ext@npm:1.1.25" - dependencies: - undici: "npm:^6.15.0" - checksum: 10c0/b9a134bf098976e37a4ca04401a28efb9fcb798fe2c9f2754553436ca522b6911a74c7c207a1b493b6d63b553a47c9f661c464dfa17cdcb6df32b5c3a7ffa21c - languageName: node - linkType: hard - "youtube-sr@npm:^4.3.9": version: 4.3.11 resolution: "youtube-sr@npm:4.3.11" @@ -5399,12 +5351,13 @@ __metadata: linkType: hard "youtubei.js@npm:^10.4.0": - version: 10.4.0 - resolution: "youtubei.js@npm:10.4.0" + version: 10.5.0 + resolution: "youtubei.js@npm:10.5.0" dependencies: + "@bufbuild/protobuf": "npm:^2.0.0" jintr: "npm:^2.1.1" tslib: "npm:^2.5.0" undici: "npm:^5.19.1" - checksum: 10c0/bf9ac81dfa5e06c4a3d7d8e323b76bea9ec3aebfce185921e299961536165ebd13672c6db259a99cae3e7909f640ca7454068c11b21137409012e66c4eaafa09 + checksum: 10c0/4449c236d336e0e436364caf7791b175876cf8433583e666a4ae8e122490faffd9abb0346ee3c9946019098ab369384322fe309d38a27bdb6c28a50de69bb11a languageName: node linkType: hard