From 4e98a31d03de74313cd78d4ed477bf1fb3c9b37b Mon Sep 17 00:00:00 2001 From: Mylloon Date: Wed, 18 Sep 2024 16:33:20 +0200 Subject: [PATCH 01/10] add debug event for discord player --- src/events/loader.ts | 16 +++++++++++++--- src/load.ts | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/events/loader.ts b/src/events/loader.ts index d84e63b..e379e88 100644 --- a/src/events/loader.ts +++ b/src/events/loader.ts @@ -1,13 +1,24 @@ -import { Player, PlayerEvents, useMainPlayer } from "discord-player"; +import { PlayerEvents, useMainPlayer } from "discord-player"; import { Client } from "discord.js"; import { readdir } from "fs/promises"; /** Load all the events */ -export default async (client: Client) => { +export default async (client: Client, isDev: boolean) => { const events_categories = (await readdir(__dirname)).filter( (element) => !element.endsWith(".js") && !element.endsWith(".ts"), ); + const player = useMainPlayer(); + + if (isDev) { + player.on("debug", async (message) => { + console.log(`General player debug event: ${message}`); + }); + player.events.on("debug", async (_, message) => { + console.log(`Player debug event: ${message}`); + }); + } + events_categories.forEach(async (event_category) => { // Retrieve events const events = await readdir(`${__dirname}/${event_category}`); @@ -29,7 +40,6 @@ export default async (client: Client) => { const event_type = event_type_ext.join("."); if (event_category == "player") { - const player = useMainPlayer() as Player; if (once) { // eslint-disable-next-line return player.events.once(event_type as keyof PlayerEvents, (...args: any[]) => { diff --git a/src/load.ts b/src/load.ts index 8c56413..5f59ec7 100644 --- a/src/load.ts +++ b/src/load.ts @@ -21,7 +21,7 @@ export const run = async (isDev: boolean) => { // Events Discord.JS and Player const events_name = "Events"; - await loadEvents(client) + await loadEvents(client, isDev) .then(() => console.log(logStart(events_name, true))) .catch((err) => { console.error(err); -- 2.45.2 From 7d7f1131c443cccaff8e1542c030a94a4c3139be Mon Sep 17 00:00:00 2001 From: Mylloon Date: Wed, 18 Sep 2024 16:59:48 +0200 Subject: [PATCH 02/10] Generate tokens --- package-lock.json | 1037 +++++++++++++++++++++++++++++++++++++++---- package.json | 1 + src/utils/client.ts | 11 +- src/utils/music.ts | 14 + 4 files changed, 973 insertions(+), 90 deletions(-) diff --git a/package-lock.json b/package-lock.json index 520e0eb..208a2b0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,6 +17,7 @@ "discord-player-youtubei": "^1.3.1", "discord.js": "^14.16.2", "mediaplex": "^0.0.9", + "puppeteer": "^23.4.0", "sqlite3": "^5.1.7", "typescript": "^5.6.2", "uuid": "^10.0.0" @@ -29,6 +30,114 @@ "ts-node-dev": "~2.0.0" } }, + "node_modules/@babel/code-frame": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", + "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", + "license": "MIT", + "dependencies": { + "@babel/highlight": "^7.24.7", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", + "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", + "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.24.7", + "chalk": "^2.4.2", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "license": "MIT", + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "license": "MIT", + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/@babel/highlight/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "license": "MIT" + }, + "node_modules/@babel/highlight/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/@babel/highlight/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "license": "MIT", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/@cspotcode/source-map-support": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", @@ -473,6 +582,28 @@ "node": ">=10" } }, + "node_modules/@puppeteer/browsers": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.4.0.tgz", + "integrity": "sha512-x8J1csfIygOwf6D6qUAZ0ASk3z63zPb7wkNeHRerCMh82qWKUrOgkuP005AJC8lDL6/evtXETGEJVcwykKT4/g==", + "license": "Apache-2.0", + "dependencies": { + "debug": "^4.3.6", + "extract-zip": "^2.0.1", + "progress": "^2.0.3", + "proxy-agent": "^6.4.0", + "semver": "^7.6.3", + "tar-fs": "^3.0.6", + "unbzip2-stream": "^1.4.3", + "yargs": "^17.7.2" + }, + "bin": { + "browsers": "lib/cjs/main-cli.js" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/@sapphire/async-queue": { "version": "1.5.3", "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.5.3.tgz", @@ -529,6 +660,12 @@ "node": ">= 6" } }, + "node_modules/@tootallnate/quickjs-emscripten": { + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz", + "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==", + "license": "MIT" + }, "node_modules/@tsconfig/node10": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", @@ -604,6 +741,16 @@ "@types/node": "*" } }, + "node_modules/@types/yauzl": { + "version": "2.10.3", + "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz", + "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==", + "license": "MIT", + "optional": true, + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "8.6.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.6.0.tgz", @@ -863,16 +1010,15 @@ } }, "node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", "license": "MIT", - "optional": true, "dependencies": { - "debug": "4" + "debug": "^4.3.4" }, "engines": { - "node": ">= 6.0.0" + "node": ">= 14" } }, "node_modules/agentkeepalive": { @@ -923,7 +1069,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "devOptional": true, "license": "MIT", "engines": { "node": ">=8" @@ -933,7 +1078,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -992,7 +1136,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true, "license": "Python-2.0" }, "node_modules/array-union": { @@ -1005,6 +1148,24 @@ "node": ">=8" } }, + "node_modules/ast-types": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz", + "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==", + "license": "MIT", + "dependencies": { + "tslib": "^2.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/b4a": { + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz", + "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==", + "license": "Apache-2.0" + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -1012,6 +1173,53 @@ "devOptional": true, "license": "MIT" }, + "node_modules/bare-events": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz", + "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==", + "license": "Apache-2.0", + "optional": true + }, + "node_modules/bare-fs": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.5.tgz", + "integrity": "sha512-SlE9eTxifPDJrT6YgemQ1WGFleevzwY+XAP1Xqgl56HtcrisC2CHCZ2tq6dBpcH2TnNxwUEUGhweo+lrQtYuiw==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "bare-events": "^2.0.0", + "bare-path": "^2.0.0", + "bare-stream": "^2.0.0" + } + }, + "node_modules/bare-os": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.4.tgz", + "integrity": "sha512-z3UiI2yi1mK0sXeRdc4O1Kk8aOa/e+FNWZcTiPB/dfTWyLypuE99LibgRaQki914Jq//yAWylcAt+mknKdixRQ==", + "license": "Apache-2.0", + "optional": true + }, + "node_modules/bare-path": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.3.tgz", + "integrity": "sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "bare-os": "^2.1.0" + } + }, + "node_modules/bare-stream": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.3.0.tgz", + "integrity": "sha512-pVRWciewGUeCyKEuRxwv06M079r+fRjAQjBEK2P6OYGrO43O+Z0LrPZZEjlc4mB6C2RpZ9AxJ1s7NLEtOHO6eA==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "b4a": "^1.6.6", + "streamx": "^2.20.0" + } + }, "node_modules/base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", @@ -1032,6 +1240,15 @@ ], "license": "MIT" }, + "node_modules/basic-ftp": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz", + "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==", + "license": "MIT", + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/binary-extensions": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", @@ -1118,6 +1335,15 @@ "ieee754": "^1.1.13" } }, + "node_modules/buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", + "license": "MIT", + "engines": { + "node": "*" + } + }, "node_modules/buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", @@ -1155,11 +1381,23 @@ "node": ">= 10" } }, + "node_modules/cacache/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "license": "ISC", + "optional": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -1229,6 +1467,20 @@ "node": ">=10" } }, + "node_modules/chromium-bidi": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.5.tgz", + "integrity": "sha512-RuLrmzYrxSb0s9SgpB+QN5jJucPduZQ/9SIe76MDxYJuecPW5mxMdacJ1f4EtgiV+R0p3sCkznTMvH0MPGFqjA==", + "license": "Apache-2.0", + "dependencies": { + "mitt": "3.0.1", + "urlpattern-polyfill": "10.0.0", + "zod": "3.23.8" + }, + "peerDependencies": { + "devtools-protocol": "*" + } + }, "node_modules/clean-stack": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", @@ -1239,11 +1491,24 @@ "node": ">=6" } }, + "node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "license": "MIT", "dependencies": { "color-name": "~1.1.4" @@ -1256,7 +1521,6 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, "license": "MIT" }, "node_modules/color-support": { @@ -1293,6 +1557,32 @@ "license": "ISC", "optional": true }, + "node_modules/cosmiconfig": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz", + "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==", + "license": "MIT", + "dependencies": { + "env-paths": "^2.2.1", + "import-fresh": "^3.3.0", + "js-yaml": "^4.1.0", + "parse-json": "^5.2.0" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/d-fischer" + }, + "peerDependencies": { + "typescript": ">=4.9.5" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, "node_modules/create-require": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", @@ -1356,7 +1646,6 @@ "version": "4.3.7", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", - "devOptional": true, "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -1401,6 +1690,20 @@ "dev": true, "license": "MIT" }, + "node_modules/degenerator": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz", + "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==", + "license": "MIT", + "dependencies": { + "ast-types": "^0.13.4", + "escodegen": "^2.1.0", + "esprima": "^4.0.1" + }, + "engines": { + "node": ">= 14" + } + }, "node_modules/delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", @@ -1417,6 +1720,12 @@ "node": ">=8" } }, + "node_modules/devtools-protocol": { + "version": "0.0.1342118", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1342118.tgz", + "integrity": "sha512-75fMas7PkYNDTmDyb6PRJCH7ILmHLp+BhrZGeMsa4bCh40DTxgCz2NRy5UDzII4C5KuD0oBMZ9vXKhEl6UD/3w==", + "license": "BSD-3-Clause" + }, "node_modules/diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", @@ -1634,8 +1943,7 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "license": "MIT", - "optional": true + "license": "MIT" }, "node_modules/encoding": { "version": "0.1.13", @@ -1673,7 +1981,6 @@ "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", "license": "MIT", - "optional": true, "engines": { "node": ">=6" } @@ -1685,6 +1992,24 @@ "license": "MIT", "optional": true }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -1698,6 +2023,27 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/escodegen": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", + "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", + "license": "BSD-2-Clause", + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=6.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, "node_modules/eslint": { "version": "8.57.1", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", @@ -1826,6 +2172,19 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "license": "BSD-2-Clause", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/esquery": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", @@ -1856,7 +2215,6 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, "license": "BSD-2-Clause", "engines": { "node": ">=4.0" @@ -1866,7 +2224,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true, "license": "BSD-2-Clause", "engines": { "node": ">=0.10.0" @@ -1881,12 +2238,38 @@ "node": ">=6" } }, + "node_modules/extract-zip": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", + "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", + "license": "BSD-2-Clause", + "dependencies": { + "debug": "^4.1.1", + "get-stream": "^5.1.0", + "yauzl": "^2.10.0" + }, + "bin": { + "extract-zip": "cli.js" + }, + "engines": { + "node": ">= 10.17.0" + }, + "optionalDependencies": { + "@types/yauzl": "^2.9.1" + } + }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "license": "MIT" }, + "node_modules/fast-fifo": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz", + "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==", + "license": "MIT" + }, "node_modules/fast-glob": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", @@ -1941,6 +2324,15 @@ "reusify": "^1.0.4" } }, + "node_modules/fd-slicer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", + "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", + "license": "MIT", + "dependencies": { + "pend": "~1.2.0" + } + }, "node_modules/fetch-blob": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz", @@ -2070,6 +2462,20 @@ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", "license": "MIT" }, + "node_modules/fs-extra": { + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", + "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=14.14" + } + }, "node_modules/fs-minipass": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", @@ -2145,6 +2551,54 @@ "undici": "^6.11.1" } }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "license": "MIT", + "dependencies": { + "pump": "^3.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-uri": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz", + "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==", + "license": "MIT", + "dependencies": { + "basic-ftp": "^5.0.2", + "data-uri-to-buffer": "^6.0.2", + "debug": "^4.3.4", + "fs-extra": "^11.2.0" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/get-uri/node_modules/data-uri-to-buffer": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz", + "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==", + "license": "MIT", + "engines": { + "node": ">= 14" + } + }, "node_modules/github-from-package": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", @@ -2251,8 +2705,7 @@ "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "license": "ISC", - "optional": true + "license": "ISC" }, "node_modules/graphemer": { "version": "1.4.0", @@ -2337,32 +2790,29 @@ "optional": true }, "node_modules/http-proxy-agent": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", - "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", "license": "MIT", - "optional": true, "dependencies": { - "@tootallnate/once": "1", - "agent-base": "6", - "debug": "4" + "agent-base": "^7.1.0", + "debug": "^4.3.4" }, "engines": { - "node": ">= 6" + "node": ">= 14" } }, "node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", + "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", "license": "MIT", - "optional": true, "dependencies": { - "agent-base": "6", + "agent-base": "^7.0.2", "debug": "4" }, "engines": { - "node": ">= 6" + "node": ">= 14" } }, "node_modules/humanize-ms": { @@ -2422,7 +2872,6 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, "license": "MIT", "dependencies": { "parent-module": "^1.0.0", @@ -2491,7 +2940,6 @@ "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", "license": "MIT", - "optional": true, "dependencies": { "jsbn": "1.1.0", "sprintf-js": "^1.1.3" @@ -2500,6 +2948,12 @@ "node": ">= 12" } }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "license": "MIT" + }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -2544,7 +2998,6 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "license": "MIT", - "optional": true, "engines": { "node": ">=8" } @@ -2618,11 +3071,16 @@ "acorn": "^8.8.0" } }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "license": "MIT" + }, "node_modules/js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, "license": "MIT", "dependencies": { "argparse": "^2.0.1" @@ -2635,8 +3093,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==", - "license": "MIT", - "optional": true + "license": "MIT" }, "node_modules/json-buffer": { "version": "3.0.1", @@ -2645,6 +3102,12 @@ "dev": true, "license": "MIT" }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "license": "MIT" + }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -2659,6 +3122,18 @@ "dev": true, "license": "MIT" }, + "node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "license": "MIT", + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, "node_modules/keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", @@ -2698,6 +3173,12 @@ "libsodium": "^0.7.15" } }, + "node_modules/lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "license": "MIT" + }, "node_modules/locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", @@ -2829,16 +3310,12 @@ } }, "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "license": "ISC", - "optional": true, - "dependencies": { - "yallist": "^4.0.0" - }, "engines": { - "node": ">=10" + "node": ">=12" } }, "node_modules/magic-bytes.js": { @@ -2882,6 +3359,76 @@ "node": ">= 10" } }, + "node_modules/make-fetch-happen/node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "license": "MIT", + "optional": true, + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/make-fetch-happen/node_modules/http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "license": "MIT", + "optional": true, + "dependencies": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/make-fetch-happen/node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "license": "MIT", + "optional": true, + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/make-fetch-happen/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "license": "ISC", + "optional": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/make-fetch-happen/node_modules/socks-proxy-agent": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz", + "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==", + "license": "MIT", + "optional": true, + "dependencies": { + "agent-base": "^6.0.2", + "debug": "^4.3.3", + "socks": "^2.6.2" + }, + "engines": { + "node": ">= 10" + } + }, "node_modules/mediaplex": { "version": "0.0.9", "resolved": "https://registry.npmjs.org/mediaplex/-/mediaplex-0.0.9.tgz", @@ -3216,6 +3763,12 @@ "node": ">= 8" } }, + "node_modules/mitt": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz", + "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==", + "license": "MIT" + }, "node_modules/mkdirp": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", @@ -3238,7 +3791,6 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "devOptional": true, "license": "MIT" }, "node_modules/napi-build-utils": { @@ -3264,6 +3816,15 @@ "node": ">= 0.6" } }, + "node_modules/netmask": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz", + "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==", + "license": "MIT", + "engines": { + "node": ">= 0.4.0" + } + }, "node_modules/node-abi": { "version": "3.67.0", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.67.0.tgz", @@ -3484,11 +4045,42 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/pac-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz", + "integrity": "sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==", + "license": "MIT", + "dependencies": { + "@tootallnate/quickjs-emscripten": "^0.23.0", + "agent-base": "^7.0.2", + "debug": "^4.3.4", + "get-uri": "^6.0.1", + "http-proxy-agent": "^7.0.0", + "https-proxy-agent": "^7.0.5", + "pac-resolver": "^7.0.1", + "socks-proxy-agent": "^8.0.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/pac-resolver": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz", + "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==", + "license": "MIT", + "dependencies": { + "degenerator": "^5.0.0", + "netmask": "^2.0.2" + }, + "engines": { + "node": ">= 14" + } + }, "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, "license": "MIT", "dependencies": { "callsites": "^3.0.0" @@ -3497,6 +4089,24 @@ "node": ">=6" } }, + "node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -3557,6 +4167,18 @@ "url": "https://github.com/sponsors/Borewit" } }, + "node_modules/pend": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", + "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==", + "license": "MIT" + }, + "node_modules/picocolors": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", + "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", + "license": "ISC" + }, "node_modules/picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", @@ -3596,6 +4218,40 @@ "node": ">=10" } }, + "node_modules/prebuild-install/node_modules/chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "license": "ISC" + }, + "node_modules/prebuild-install/node_modules/tar-fs": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", + "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", + "license": "MIT", + "dependencies": { + "chownr": "^1.1.1", + "mkdirp-classic": "^0.5.2", + "pump": "^3.0.0", + "tar-stream": "^2.1.4" + } + }, + "node_modules/prebuild-install/node_modules/tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "license": "MIT", + "dependencies": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -3836,6 +4492,15 @@ } } }, + "node_modules/progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/promise-inflight": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", @@ -3857,6 +4522,31 @@ "node": ">=10" } }, + "node_modules/proxy-agent": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz", + "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==", + "license": "MIT", + "dependencies": { + "agent-base": "^7.0.2", + "debug": "^4.3.4", + "http-proxy-agent": "^7.0.1", + "https-proxy-agent": "^7.0.3", + "lru-cache": "^7.14.1", + "pac-proxy-agent": "^7.0.1", + "proxy-from-env": "^1.1.0", + "socks-proxy-agent": "^8.0.2" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" + }, "node_modules/pump": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz", @@ -3877,6 +4567,44 @@ "node": ">=6" } }, + "node_modules/puppeteer": { + "version": "23.4.0", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.4.0.tgz", + "integrity": "sha512-FxgFFJI7NAsX8uebiEDSjS86vufz9TaqERQHShQT0lCbSRI3jUPEcz/0HdwLiYvfYNsc1zGjqY3NsGZya4PvUA==", + "hasInstallScript": true, + "license": "Apache-2.0", + "dependencies": { + "@puppeteer/browsers": "2.4.0", + "chromium-bidi": "0.6.5", + "cosmiconfig": "^9.0.0", + "devtools-protocol": "0.0.1342118", + "puppeteer-core": "23.4.0", + "typed-query-selector": "^2.12.0" + }, + "bin": { + "puppeteer": "lib/cjs/puppeteer/node/cli.js" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/puppeteer-core": { + "version": "23.4.0", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.4.0.tgz", + "integrity": "sha512-fqkIP5FOcb38jfBj/OcBz1wFaI9nk40uQKSORvnXws6wCbep2dg8yxZ3ddJxBIfQsxoiEOvnrykFinUScrB/ew==", + "license": "Apache-2.0", + "dependencies": { + "@puppeteer/browsers": "2.4.0", + "chromium-bidi": "0.6.5", + "debug": "^4.3.7", + "devtools-protocol": "0.0.1342118", + "typed-query-selector": "^2.12.0", + "ws": "^8.18.0" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -3898,6 +4626,12 @@ ], "license": "MIT" }, + "node_modules/queue-tick": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz", + "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==", + "license": "MIT" + }, "node_modules/rc": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", @@ -3972,6 +4706,15 @@ "node": ">=8.10.0" } }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/require-relative": { "version": "0.8.7", "resolved": "https://registry.npmjs.org/require-relative/-/require-relative-0.8.7.tgz", @@ -4001,7 +4744,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, "license": "MIT", "engines": { "node": ">=4" @@ -4234,7 +4976,6 @@ "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", "license": "MIT", - "optional": true, "engines": { "node": ">= 6.0.0", "npm": ">= 3.0.0" @@ -4245,7 +4986,6 @@ "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==", "license": "MIT", - "optional": true, "dependencies": { "ip-address": "^9.0.5", "smart-buffer": "^4.2.0" @@ -4256,18 +4996,17 @@ } }, "node_modules/socks-proxy-agent": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz", - "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz", + "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==", "license": "MIT", - "optional": true, "dependencies": { - "agent-base": "^6.0.2", - "debug": "^4.3.3", - "socks": "^2.6.2" + "agent-base": "^7.1.1", + "debug": "^4.3.4", + "socks": "^2.8.3" }, "engines": { - "node": ">= 10" + "node": ">= 14" } }, "node_modules/soundcloud.ts": { @@ -4283,7 +5022,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, + "devOptional": true, "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -4326,8 +5065,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", - "license": "BSD-3-Clause", - "optional": true + "license": "BSD-3-Clause" }, "node_modules/sqlite3": { "version": "5.1.7", @@ -4366,6 +5104,20 @@ "node": ">= 8" } }, + "node_modules/streamx": { + "version": "2.20.1", + "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.20.1.tgz", + "integrity": "sha512-uTa0mU6WUC65iUvzKH4X9hEdvSW7rbPxPtwfWiLMSj3qTdQbAiUboZTxauKfpFuGIGa1C2BYijZ7wgdUXICJhA==", + "license": "MIT", + "dependencies": { + "fast-fifo": "^1.3.2", + "queue-tick": "^1.0.1", + "text-decoder": "^1.1.0" + }, + "optionalDependencies": { + "bare-events": "^2.2.0" + } + }, "node_modules/string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", @@ -4380,7 +5132,6 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "license": "MIT", - "optional": true, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -4394,7 +5145,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "devOptional": true, "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -4487,37 +5237,28 @@ } }, "node_modules/tar-fs": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", - "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz", + "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==", "license": "MIT", "dependencies": { - "chownr": "^1.1.1", - "mkdirp-classic": "^0.5.2", "pump": "^3.0.0", - "tar-stream": "^2.1.4" + "tar-stream": "^3.1.5" + }, + "optionalDependencies": { + "bare-fs": "^2.1.1", + "bare-path": "^2.1.0" } }, - "node_modules/tar-fs/node_modules/chownr": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", - "license": "ISC" - }, "node_modules/tar-stream": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", - "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz", + "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==", "license": "MIT", "dependencies": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - }, - "engines": { - "node": ">=6" + "b4a": "^1.6.4", + "fast-fifo": "^1.2.0", + "streamx": "^2.15.0" } }, "node_modules/tar/node_modules/minipass": { @@ -4529,6 +5270,15 @@ "node": ">=8" } }, + "node_modules/text-decoder": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.0.tgz", + "integrity": "sha512-n1yg1mOj9DNpk3NeZOx7T6jchTbyJS3i3cucbNN6FcdPriMZx7NsgrGpWWdWZZGxD7ES1XB+3uoqHMgOKaN+fg==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.4" + } + }, "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", @@ -4536,6 +5286,12 @@ "dev": true, "license": "MIT" }, + "node_modules/through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", + "license": "MIT" + }, "node_modules/tiny-typed-emitter": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz", @@ -4767,6 +5523,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/typed-query-selector": { + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/typed-query-selector/-/typed-query-selector-2.12.0.tgz", + "integrity": "sha512-SbklCd1F0EiZOyPiW192rrHZzZ5sBijB6xM+cpmrwDqObvdtunOHHIk9fCGsoK5JVIYXoyEp4iEdE3upFH3PAg==", + "license": "MIT" + }, "node_modules/typescript": { "version": "5.6.2", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", @@ -4780,6 +5542,16 @@ "node": ">=14.17" } }, + "node_modules/unbzip2-stream": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", + "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", + "license": "MIT", + "dependencies": { + "buffer": "^5.2.1", + "through": "^2.3.8" + } + }, "node_modules/undici": { "version": "6.19.8", "resolved": "https://registry.npmjs.org/undici/-/undici-6.19.8.tgz", @@ -4824,6 +5596,15 @@ "imurmurhash": "^0.1.4" } }, + "node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "license": "MIT", + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -4834,6 +5615,12 @@ "punycode": "^2.1.0" } }, + "node_modules/urlpattern-polyfill": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz", + "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==", + "license": "MIT" + }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -4946,6 +5733,23 @@ "node": ">=0.10.0" } }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -4983,12 +5787,58 @@ "node": ">=0.4" } }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "license": "ISC", + "engines": { + "node": ">=10" + } + }, "node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "license": "ISC" }, + "node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "license": "MIT", + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/yauzl": { + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", + "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", + "license": "MIT", + "dependencies": { + "buffer-crc32": "~0.2.3", + "fd-slicer": "~1.1.0" + } + }, "node_modules/yn": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", @@ -5043,6 +5893,15 @@ "engines": { "node": ">=14.0" } + }, + "node_modules/zod": { + "version": "3.23.8", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz", + "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/colinhacks" + } } } } diff --git a/package.json b/package.json index 4d6f400..82710f3 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "discord-player-youtubei": "^1.3.1", "discord.js": "^14.16.2", "mediaplex": "^0.0.9", + "puppeteer": "^23.4.0", "sqlite3": "^5.1.7", "typescript": "^5.6.2", "uuid": "^10.0.0" diff --git a/src/utils/client.ts b/src/utils/client.ts index badb018..a288919 100644 --- a/src/utils/client.ts +++ b/src/utils/client.ts @@ -5,6 +5,7 @@ import { Database } from "sqlite3"; import "../modules/client"; import { loadLocales } from "./locales"; import { YoutubeiExtractor } from "discord-player-youtubei"; +import { YoutubeWebTokenRoutine } from "./music"; /** Creation of the client and definition of its properties */ export default async () => { @@ -42,6 +43,9 @@ export default async () => { list: new Collection(), }; + // Generate tokens + const tokens = await YoutubeWebTokenRoutine(true); + const player = Player.singleton(client, { skipFFmpeg: true, ytdlOptions: { @@ -50,7 +54,12 @@ export default async () => { }, }); await player.extractors.loadDefault((ext) => ext !== "YouTubeExtractor"); - await player.extractors.register(YoutubeiExtractor, {}); + await player.extractors.register(YoutubeiExtractor, { + streamOptions: { + useClient: "WEB", + }, + trustedTokens: tokens, + }); console.log("Translations progression :"); client.locales = await loadLocales(client.config.default_lang); diff --git a/src/utils/music.ts b/src/utils/music.ts index bcf5002..ce63377 100644 --- a/src/utils/music.ts +++ b/src/utils/music.ts @@ -2,6 +2,7 @@ import { EmbedBuilder } from "@discordjs/builders"; import { GuildQueue, QueueRepeatMode, Track } from "discord-player"; import { Client } from "discord.js"; import { getLocale } from "./locales"; +import { generateTrustedToken, YoutubeiExtractor } from "discord-player-youtubei"; export const embedListQueue = ( client: Client, @@ -57,3 +58,16 @@ const printRepeatMode = (mode: QueueRepeatMode, loc: Map) => { break; } }; + +export const YoutubeWebTokenRoutine = async (first: boolean) => { + // Repeat in one week : 7 * 24 * 60 * 60 * 1000 + setTimeout(YoutubeWebTokenRoutine, 604800000, false); + + const tokens = await generateTrustedToken(); + if (first) { + return tokens; + } + + const instance = YoutubeiExtractor.getInstance(); + instance?.setTrustedTokens(tokens); +}; -- 2.45.2 From b31673451189f6a0aaa76171ea8c6ae25de5a232 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Wed, 18 Sep 2024 17:15:13 +0200 Subject: [PATCH 03/10] splitFilenameExtensions --- src/events/loader.ts | 6 ++---- src/utils/misc.ts | 21 ++++++++++++++------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/events/loader.ts b/src/events/loader.ts index d84e63b..1a40e39 100644 --- a/src/events/loader.ts +++ b/src/events/loader.ts @@ -1,6 +1,7 @@ import { Player, PlayerEvents, useMainPlayer } from "discord-player"; import { Client } from "discord.js"; import { readdir } from "fs/promises"; +import { splitFilenameExtensions } from "../utils/misc"; /** Load all the events */ export default async (client: Client) => { @@ -20,13 +21,10 @@ export default async (client: Client) => { ); // Remove extension - // TODO: use utils functions - const event_type_ext = event_file.split("."); - const ext = event_type_ext.pop(); + const { file: event_type, ext } = splitFilenameExtensions(event_file); if (!(ext === "js" || ext === "ts")) { throw `Unknown file in ${event_category}: ${event_file}`; } - const event_type = event_type_ext.join("."); if (event_category == "player") { const player = useMainPlayer() as Player; diff --git a/src/utils/misc.ts b/src/utils/misc.ts index 4e863f8..b89db42 100644 --- a/src/utils/misc.ts +++ b/src/utils/misc.ts @@ -28,16 +28,25 @@ export const getFilename = (path: string) => { return removeExtension(filename_with_ext); }; +/** + * Split a filename and his extension + * @param filename string of the filename + * @returns Object with filename and extension splitted + */ +export const splitFilenameExtensions = (filename: string) => { + const array = filename.split("."); + const ext = array.pop(); + + return { file: array.join("."), ext }; +}; + /** * Remove extension from a filename * @param filename string of the filename with an extension * @returns string of the filename without an extension */ export const removeExtension = (filename: string) => { - const array = filename.split("."); - array.pop(); - - return array.join("."); + return splitFilenameExtensions(filename).file; }; /** @@ -46,9 +55,7 @@ export const removeExtension = (filename: string) => { * @returns string of the extension if it exists */ export const getExtension = (filename: string) => { - const array = filename.split("."); - - return array.pop(); + return splitFilenameExtensions(filename).ext; }; /** -- 2.45.2 From a9163f110bfcb295cb35cdbc150a88228ae92054 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Wed, 18 Sep 2024 17:20:16 +0200 Subject: [PATCH 04/10] === instead of == --- src/buttons/misc/reminderList-prec.ts | 2 +- src/buttons/music/queueList-prec.ts | 2 +- src/commands/loader.ts | 2 +- src/commands/misc/archive.ts | 14 +++++++------- src/commands/misc/prep.ts | 14 +++++++------- src/commands/misc/reminder.ts | 2 +- src/commands/music/lyrics.ts | 4 ++-- src/events/loader.ts | 2 +- src/events/message/messageCreate.ts | 4 ++-- src/utils/music.ts | 4 ++-- src/utils/reminder.ts | 4 ++-- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/buttons/misc/reminderList-prec.ts b/src/buttons/misc/reminderList-prec.ts index 8c4de21..dd093e9 100644 --- a/src/buttons/misc/reminderList-prec.ts +++ b/src/buttons/misc/reminderList-prec.ts @@ -23,7 +23,7 @@ export default { // Retrieve Pages const pageMax = Number(/(\d+)(?!.*\d)/gm.exec(embed_desc)?.[0]); let page = Number(/(?!• \s+)\d(?=\/)/gm.exec(embed_desc)?.[0]); - if (page - 1 == 0) { + if (page - 1 === 0) { page = pageMax; } else { page--; diff --git a/src/buttons/music/queueList-prec.ts b/src/buttons/music/queueList-prec.ts index 3260334..6326dd4 100644 --- a/src/buttons/music/queueList-prec.ts +++ b/src/buttons/music/queueList-prec.ts @@ -24,7 +24,7 @@ export default { // Retrieve Pages const pageMax = Number(/(\d+)(?!.*\d)/gm.exec(embed_desc)?.[0]); let page = Number(/(?!• \s+)\d(?=\/)/gm.exec(embed_desc)?.[0]); - if (page - 1 == 0) { + if (page - 1 === 0) { page = pageMax; } else { page--; diff --git a/src/commands/loader.ts b/src/commands/loader.ts index d6b3e39..33e17aa 100644 --- a/src/commands/loader.ts +++ b/src/commands/loader.ts @@ -70,7 +70,7 @@ export default async (client: Client) => { ); // Send global commands to Discord - const globalCommands = commands.filter((c) => c.scope().length == 0); + const globalCommands = commands.filter((c) => c.scope().length === 0); return await rest.put(Routes.applicationCommands(client.user?.id as string), { body: globalCommands.map((c) => c.data.toJSON()), }); diff --git a/src/commands/misc/archive.ts b/src/commands/misc/archive.ts index 2fa4bdf..7dec644 100644 --- a/src/commands/misc/archive.ts +++ b/src/commands/misc/archive.ts @@ -74,14 +74,14 @@ export default { allChannel?.then(async (channelGuild) => { // Retrieve category to archive const catToArchive = channelGuild - .filter((chan) => chan?.type == ChannelType.GuildCategory) - .filter((chan) => chan?.name == desiredCat); + .filter((chan) => chan?.type === ChannelType.GuildCategory) + .filter((chan) => chan?.name === desiredCat); // Create/Retrieve the archive category const catArchivedName = "archive - " + desiredCat; const catArchivedMap = channelGuild - .filter((chan) => chan?.type == ChannelType.GuildCategory) - .filter((chan) => chan?.name == catArchivedName); + .filter((chan) => chan?.type === ChannelType.GuildCategory) + .filter((chan) => chan?.name === catArchivedName); let catArchived: NonThreadGuildBasedChannel | null | undefined; if (catArchivedMap.size > 0) { @@ -94,11 +94,11 @@ export default { } const allChannelDesired = channelGuild - .filter((chan) => chan?.type == 0) - .filter((chan) => chan?.parentId == catToArchive.map((cat) => cat?.id)[0]); + .filter((chan) => chan?.type === 0) + .filter((chan) => chan?.parentId === catToArchive.map((cat) => cat?.id)[0]); // If no channels in the source category - if (allChannelDesired.size == 0) { + if (allChannelDesired.size === 0) { return interaction.reply({ embeds: [ new EmbedBuilder() diff --git a/src/commands/misc/prep.ts b/src/commands/misc/prep.ts index fa4ab30..423c8dc 100644 --- a/src/commands/misc/prep.ts +++ b/src/commands/misc/prep.ts @@ -67,21 +67,21 @@ export default { const allChannel = interaction.guild?.channels.fetch(); allChannel?.then((channel_guild) => { const cat_to_prep = channel_guild - .filter((chan) => chan?.type == ChannelType.GuildCategory) - .filter((chan) => chan?.name == desired_cat); + .filter((chan) => chan?.type === ChannelType.GuildCategory) + .filter((chan) => chan?.name === desired_cat); const cat_to_prep_id = cat_to_prep.map((cat) => cat?.id); const cat_to_prep_name = cat_to_prep.map((cat) => cat?.name); // console.log(cat_to_prep); const all_channel_desired = channel_guild - .filter((chan) => chan?.type == 0) - .filter((chan) => chan?.parentId == cat_to_prep_id[0]); + .filter((chan) => chan?.type === 0) + .filter((chan) => chan?.parentId === cat_to_prep_id[0]); const all_channel_desired_name = all_channel_desired.map((c_d) => c_d?.name); let desc = ""; const general = "général"; - if (all_channel_desired_name.filter((cdn) => cdn == general).length == 0) { + if (all_channel_desired_name.filter((cdn) => cdn === general).length === 0) { interaction.guild?.channels.create({ name: general, type: 0, @@ -91,7 +91,7 @@ export default { } const info = "informations"; - if (all_channel_desired_name.filter((cdn) => cdn == info).length == 0) { + if (all_channel_desired_name.filter((cdn) => cdn === info).length === 0) { interaction.guild?.channels.create({ name: info, type: 0, @@ -101,7 +101,7 @@ export default { desc += "`" + info + "` " + loc.get("c_prep5") + "\n"; } - if (desc == "") { + if (desc === "") { desc = loc.get("c_prep6"); } diff --git a/src/commands/misc/reminder.ts b/src/commands/misc/reminder.ts index 0bf35b0..4c2c234 100644 --- a/src/commands/misc/reminder.ts +++ b/src/commands/misc/reminder.ts @@ -205,7 +205,7 @@ export default { let user = interaction.options.getUser( loc_default?.get(`c_${filename}_sub2_opt1_name`) as string, ); - if (user == null) { + if (user === null) { user = interaction.user; } diff --git a/src/commands/music/lyrics.ts b/src/commands/music/lyrics.ts index 3b7dcfb..a0b34d5 100644 --- a/src/commands/music/lyrics.ts +++ b/src/commands/music/lyrics.ts @@ -85,7 +85,7 @@ export default { const queue = useQueue(interaction.guildId!); if (request) { if ( - interaction.options.getSubcommand() == + interaction.options.getSubcommand() === loc_default?.get(`c_${filename}_sub2_name`)?.toLowerCase() ) { // Romanized @@ -111,7 +111,7 @@ export default { } if ( - interaction.options.getSubcommand() == + interaction.options.getSubcommand() === loc_default?.get(`c_${filename}_sub3_name`)?.toLowerCase() ) { if (queue === null) { diff --git a/src/events/loader.ts b/src/events/loader.ts index 1a40e39..4d5ef40 100644 --- a/src/events/loader.ts +++ b/src/events/loader.ts @@ -26,7 +26,7 @@ export default async (client: Client) => { throw `Unknown file in ${event_category}: ${event_file}`; } - if (event_category == "player") { + if (event_category === "player") { const player = useMainPlayer() as Player; if (once) { // eslint-disable-next-line diff --git a/src/events/message/messageCreate.ts b/src/events/message/messageCreate.ts index 2afe9fb..1803a51 100644 --- a/src/events/message/messageCreate.ts +++ b/src/events/message/messageCreate.ts @@ -82,7 +82,7 @@ export default async (message: Message, client: Client) => { // If message doesn't exist or empty if ( !quoted_message || - (!quoted_message.content && quoted_message.attachments.size == 0) + (!quoted_message.content && quoted_message.attachments.size === 0) ) { return; } @@ -143,7 +143,7 @@ export default async (message: Message, client: Client) => { } let author = "Auteur"; - if (message.author == quoted_post?.author) { + if (message.author === quoted_post?.author) { author += " & Citateur"; } else { footer += `\nCité par ${userWithNickname(message.member as GuildMember) ?? "?"} le ${showDate( diff --git a/src/utils/music.ts b/src/utils/music.ts index bcf5002..68b0fb0 100644 --- a/src/utils/music.ts +++ b/src/utils/music.ts @@ -25,10 +25,10 @@ export const embedListQueue = ( embed.setFooter({ text: `${printRepeatMode(queue.repeatMode, loc)}` }); tracks.slice((page - 1) * limit_fields, page * limit_fields).forEach((t, idx) => { - const now_playing = idx == 0 && page == 1; + const now_playing = idx === 0 && page === 1; const name = now_playing ? loc.get("c_queue10") - : (idx == 1 && page == 1) || (idx == 0 && page > 1) + : (idx === 1 && page === 1) || (idx === 0 && page > 1) ? loc.get("c_queue11") : "\u200b"; const idx_track = now_playing ? "" : `${idx + limit_fields * (page - 1)}. `; diff --git a/src/utils/reminder.ts b/src/utils/reminder.ts index f735920..b15318b 100644 --- a/src/utils/reminder.ts +++ b/src/utils/reminder.ts @@ -166,7 +166,7 @@ export const sendReminder = (client: Client, info: infoReminder, option: OptionR } } - if (option == OptionReminder.DirectMessage || !channelOk || !guildOk) { + if (option === OptionReminder.DirectMessage || !channelOk || !guildOk) { // Direct message const user = client.users.cache.get(info.userId); if (user !== undefined) { @@ -182,7 +182,7 @@ export const sendReminder = (client: Client, info: infoReminder, option: OptionR }); // Mention everybody if needed - if (option == OptionReminder.Mention) { + if (option === OptionReminder.Mention) { (info.message?.match(/<@\d+>/g) ?? []).forEach((mention) => { content += " " + mention; }); -- 2.45.2 From f5f3108cd6aeb2556b711fcd14642d490fbfdd2c Mon Sep 17 00:00:00 2001 From: Mylloon Date: Wed, 18 Sep 2024 17:22:06 +0200 Subject: [PATCH 05/10] add player error --- src/events/loader.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/events/loader.ts b/src/events/loader.ts index e379e88..6aa2ec8 100644 --- a/src/events/loader.ts +++ b/src/events/loader.ts @@ -19,6 +19,18 @@ export default async (client: Client, isDev: boolean) => { }); } + player.events.on("error", (_, error) => { + // Emitted when the player queue encounters error + console.error(`General player error event: ${error.message}`); + console.error(error); + }); + + player.events.on("playerError", (_, error) => { + // Emitted when the audio player errors while streaming audio track + console.error(`Player error event: ${error.message}`); + console.error(error); + }); + events_categories.forEach(async (event_category) => { // Retrieve events const events = await readdir(`${__dirname}/${event_category}`); -- 2.45.2 From 7e9dadef1ec863805544a83fc092318f27b130a1 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Wed, 18 Sep 2024 17:23:16 +0200 Subject: [PATCH 06/10] newline --- src/events/loader.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/events/loader.ts b/src/events/loader.ts index 6aa2ec8..7c165de 100644 --- a/src/events/loader.ts +++ b/src/events/loader.ts @@ -14,6 +14,7 @@ export default async (client: Client, isDev: boolean) => { player.on("debug", async (message) => { console.log(`General player debug event: ${message}`); }); + player.events.on("debug", async (_, message) => { console.log(`Player debug event: ${message}`); }); -- 2.45.2 From a6b52c9f7859d7eea1682195aa426a999431c2ce Mon Sep 17 00:00:00 2001 From: Mylloon Date: Wed, 18 Sep 2024 17:27:32 +0200 Subject: [PATCH 07/10] artifact from previous merge --- src/events/loader.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/events/loader.ts b/src/events/loader.ts index eebf8a6..58c966b 100644 --- a/src/events/loader.ts +++ b/src/events/loader.ts @@ -51,7 +51,6 @@ export default async (client: Client, isDev: boolean) => { } if (event_category === "player") { - const player = useMainPlayer() as Player; if (once) { // eslint-disable-next-line return player.events.once(event_type as keyof PlayerEvents, (...args: any[]) => { -- 2.45.2 From 504961d16e0d423e59b50ee5279c6b60648893b1 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Wed, 18 Sep 2024 18:06:26 +0200 Subject: [PATCH 08/10] cleanup code --- src/buttons/loader.ts | 4 +-- src/buttons/misc/reminderList-next.ts | 11 ++++---- src/buttons/misc/reminderList-prec.ts | 11 ++++---- src/buttons/music/queueList-next.ts | 6 ++--- src/commands/loader.ts | 4 +-- src/commands/misc/help.ts | 3 +-- src/commands/music/lyrics.ts | 4 +-- src/commands/music/play.ts | 12 ++++----- src/commands/music/queue.ts | 2 +- src/commands/music/stop.ts | 11 ++++---- src/events/loader.ts | 4 +-- src/events/message/messageCreate.ts | 4 +-- src/utils/misc.ts | 39 +++++++++++++++++---------- src/utils/music.ts | 4 +-- 14 files changed, 62 insertions(+), 57 deletions(-) diff --git a/src/buttons/loader.ts b/src/buttons/loader.ts index 4db3d9f..c93897c 100644 --- a/src/buttons/loader.ts +++ b/src/buttons/loader.ts @@ -1,5 +1,5 @@ import { readdir } from "fs/promises"; -import { removeExtension } from "../utils/misc"; +import { removeExtension, splitFilenameExtensions } from "../utils/misc"; import { ChatInputCommandInteraction, Client, @@ -11,7 +11,7 @@ import { getLocale } from "../utils/locales"; export default async (client: Client) => { // Dossier des buttons const buttons_categories = (await readdir(__dirname)).filter( - (element) => !element.endsWith(".js") && !element.endsWith(".ts"), + (element) => splitFilenameExtensions(element)?.ext === undefined, ); await Promise.all( diff --git a/src/buttons/misc/reminderList-next.ts b/src/buttons/misc/reminderList-next.ts index 60a870b..077cce1 100644 --- a/src/buttons/misc/reminderList-next.ts +++ b/src/buttons/misc/reminderList-next.ts @@ -4,7 +4,6 @@ import { ButtonStyle, Client, MessageComponentInteraction, - User, } from "discord.js"; import { v4 as uuidv4 } from "uuid"; import { getLocale } from "../../utils/locales"; @@ -18,11 +17,11 @@ export default { }, interaction: async (interaction: MessageComponentInteraction, client: Client) => { const loc = getLocale(client, interaction.locale); - const embed_desc = interaction.message.embeds.at(0)?.description as string; + const embed_desc = interaction.message.embeds.at(0)?.description; // Retrieve Pages - const pageMax = Number(/(\d+)(?!.*\d)/gm.exec(embed_desc)?.[0]); - let page = Number(/(?!• \s+)\d(?=\/)/gm.exec(embed_desc)?.[0]); + const pageMax = Number(/(\d+)(?!.*\d)/gm.exec(embed_desc!)?.[0]); + let page = Number(/(?!• \s+)\d(?=\/)/gm.exec(embed_desc!)?.[0]); if (page + 1 > pageMax) { page = 1; } else { @@ -30,8 +29,8 @@ export default { } // Retrieve user - const userId = /(?!<@)\d+(?=>)/gm.exec(embed_desc)?.[0] as string; - const user = client.users.cache.get(userId) as User; + const userId = /(?!<@)\d+(?=>)/gm.exec(embed_desc!)?.[0]; + const user = client.users.cache.get(userId!)!; // Fetch list const list = await embedListReminders( diff --git a/src/buttons/misc/reminderList-prec.ts b/src/buttons/misc/reminderList-prec.ts index dd093e9..984527a 100644 --- a/src/buttons/misc/reminderList-prec.ts +++ b/src/buttons/misc/reminderList-prec.ts @@ -4,7 +4,6 @@ import { ButtonStyle, Client, MessageComponentInteraction, - User, } from "discord.js"; import { v4 as uuidv4 } from "uuid"; import { getLocale } from "../../utils/locales"; @@ -18,11 +17,11 @@ export default { }, interaction: async (interaction: MessageComponentInteraction, client: Client) => { const loc = getLocale(client, interaction.locale); - const embed_desc = interaction.message.embeds.at(0)?.description as string; + const embed_desc = interaction.message.embeds.at(0)?.description; // Retrieve Pages - const pageMax = Number(/(\d+)(?!.*\d)/gm.exec(embed_desc)?.[0]); - let page = Number(/(?!• \s+)\d(?=\/)/gm.exec(embed_desc)?.[0]); + const pageMax = Number(/(\d+)(?!.*\d)/gm.exec(embed_desc!)?.[0]); + let page = Number(/(?!• \s+)\d(?=\/)/gm.exec(embed_desc!)?.[0]); if (page - 1 === 0) { page = pageMax; } else { @@ -30,8 +29,8 @@ export default { } // Retrieve user - const userId = /(?!<@)\d+(?=>)/gm.exec(embed_desc)?.[0] as string; - const user = client.users.cache.get(userId) as User; + const userId = /(?!<@)\d+(?=>)/gm.exec(embed_desc!)?.[0]; + const user = client.users.cache.get(userId!)!; // Fetch list const list = await embedListReminders( diff --git a/src/buttons/music/queueList-next.ts b/src/buttons/music/queueList-next.ts index a160587..2ed0a53 100644 --- a/src/buttons/music/queueList-next.ts +++ b/src/buttons/music/queueList-next.ts @@ -19,11 +19,11 @@ export default { }, interaction: async (interaction: MessageComponentInteraction, client: Client) => { const loc = getLocale(client, interaction.locale); - const embed_desc = interaction.message.embeds.at(0)?.author?.name as string; + const embed_desc = interaction.message.embeds.at(0)?.author?.name; // Retrieve Pages - const pageMax = Number(/(\d+)(?!.*\d)/gm.exec(embed_desc)?.[0]); - let page = Number(/(?!• \s+)\d(?=\/)/gm.exec(embed_desc)?.[0]); + const pageMax = Number(/(\d+)(?!.*\d)/gm.exec(embed_desc!)?.[0]); + let page = Number(/(?!• \s+)\d(?=\/)/gm.exec(embed_desc!)?.[0]); if (page + 1 > pageMax) { page = 1; } else { diff --git a/src/commands/loader.ts b/src/commands/loader.ts index 33e17aa..419bef4 100644 --- a/src/commands/loader.ts +++ b/src/commands/loader.ts @@ -2,14 +2,14 @@ import { REST } from "@discordjs/rest"; import { Routes } from "discord-api-types/v9"; import { Client } from "discord.js"; import { readdir } from "fs/promises"; -import { removeExtension } from "../utils/misc"; +import { removeExtension, splitFilenameExtensions } from "../utils/misc"; /** Load all the commands */ export default async (client: Client) => { const rest = new REST({ version: "10" }).setToken(client.token!); const command_categories = (await readdir(__dirname)).filter( - (element) => !element.endsWith(".js") && !element.endsWith(".ts"), + (element) => splitFilenameExtensions(element)?.ext === undefined, ); const commands = ( diff --git a/src/commands/misc/help.ts b/src/commands/misc/help.ts index bd1238b..ce9ebac 100644 --- a/src/commands/misc/help.ts +++ b/src/commands/misc/help.ts @@ -1,5 +1,4 @@ import { SlashCommandBuilder } from "@discordjs/builders"; -import { Locale } from "discord-api-types/v9"; import { ChatInputCommandInteraction, Client, Colors, EmbedBuilder } from "discord.js"; import "../../modules/string"; import { getLocale, getLocalizations } from "../../utils/locales"; @@ -93,7 +92,7 @@ export default { .setDescription( // Loads the description // according to the user's locals - command.data.description_localizations?.[interaction.locale as Locale] ?? + command.data.description_localizations?.[interaction.locale] ?? command.data.description, ), ], diff --git a/src/commands/music/lyrics.ts b/src/commands/music/lyrics.ts index a0b34d5..27088c2 100644 --- a/src/commands/music/lyrics.ts +++ b/src/commands/music/lyrics.ts @@ -1,5 +1,5 @@ import { SlashCommandBuilder } from "@discordjs/builders"; -import { Player, useMainPlayer, useQueue } from "discord-player"; +import { useMainPlayer, useQueue } from "discord-player"; import { ChatInputCommandInteraction, Client, EmbedBuilder } from "discord.js"; import { getLocale, getLocalizations } from "../../utils/locales"; import { getFilename } from "../../utils/misc"; @@ -81,7 +81,7 @@ export default { let data = null; await interaction.deferReply(); - const player = useMainPlayer() as Player; + const player = useMainPlayer(); const queue = useQueue(interaction.guildId!); if (request) { if ( diff --git a/src/commands/music/play.ts b/src/commands/music/play.ts index bda4646..ed5ab35 100644 --- a/src/commands/music/play.ts +++ b/src/commands/music/play.ts @@ -1,12 +1,10 @@ import { SlashCommandBuilder } from "@discordjs/builders"; -import { Player, SearchResult, useMainPlayer, useQueue } from "discord-player"; +import { SearchResult, useMainPlayer, useQueue } from "discord-player"; import { AutocompleteInteraction, ChatInputCommandInteraction, Client, EmbedBuilder, - GuildResolvable, - VoiceBasedChannel, } from "discord.js"; import { getLocale, getLocalizations } from "../../utils/locales"; import { Metadata } from "../../utils/metadata"; @@ -71,7 +69,7 @@ export default { loc_default?.get(`c_${filename}_opt1_name`) as string, ); - const player = useMainPlayer() as Player; + const player = useMainPlayer(); if (!query) { // Now playing @@ -97,7 +95,7 @@ export default { return await interaction.reply({ embeds: [embed] }); } - const queue = player.nodes.create(interaction.guild as GuildResolvable, { + const queue = player.nodes.create(interaction.guild!, { defaultFFmpegFilters: ["silenceremove"], metadata: { channel: interaction.channel, @@ -106,7 +104,7 @@ export default { // Verify vc connection try { - if (!queue.connection) await queue.connect(member.voice.channel as VoiceBasedChannel); + if (!queue.connection) await queue.connect(member.voice.channel!); } catch { queue.delete(); return await interaction.reply({ @@ -155,7 +153,7 @@ export default { const loc_default = interaction.client.locales.get(interaction.client.config.default_lang); const filename = getFilename(__filename); - const player = useMainPlayer() as Player; + const player = useMainPlayer(); const query = interaction.options.getString( loc_default?.get(`c_${filename}_opt1_name`) as string, true, diff --git a/src/commands/music/queue.ts b/src/commands/music/queue.ts index 2ba005e..5a761c4 100644 --- a/src/commands/music/queue.ts +++ b/src/commands/music/queue.ts @@ -153,7 +153,7 @@ export default { case loc_default?.get(`c_${filename}_sub3_name`)?.toLowerCase(): { const id = interaction.options.getNumber( loc_default?.get(`c_${filename}_sub3_opt1_name`) as string, - ) as number; + )!; const track = queue.removeTrack(id - 1); diff --git a/src/commands/music/stop.ts b/src/commands/music/stop.ts index eed0062..ac8e9ca 100644 --- a/src/commands/music/stop.ts +++ b/src/commands/music/stop.ts @@ -1,8 +1,7 @@ import { SlashCommandBuilder } from "@discordjs/builders"; -import { Player, useMainPlayer } from "discord-player"; -import { ChatInputCommandInteraction, Client, GuildResolvable } from "discord.js"; +import { useMainPlayer } from "discord-player"; +import { ChatInputCommandInteraction, Client } from "discord.js"; import { getLocale, getLocalizations } from "../../utils/locales"; -import { Metadata } from "../../utils/metadata"; import { getFilename } from "../../utils/misc"; export default { @@ -25,11 +24,11 @@ export default { interaction: async (interaction: ChatInputCommandInteraction, client: Client) => { const loc = getLocale(client, interaction.locale); - const player = useMainPlayer() as Player; - const queue = player.nodes.create(interaction.guild as GuildResolvable, { + const player = useMainPlayer(); + const queue = player.nodes.create(interaction.guild!, { metadata: { channel: interaction.channel, - } as Metadata, + }, }); if (!(queue.connection || queue.node.isPlaying())) { diff --git a/src/events/loader.ts b/src/events/loader.ts index 58c966b..733784c 100644 --- a/src/events/loader.ts +++ b/src/events/loader.ts @@ -6,7 +6,7 @@ import { splitFilenameExtensions } from "../utils/misc"; /** Load all the events */ export default async (client: Client, isDev: boolean) => { const events_categories = (await readdir(__dirname)).filter( - (element) => !element.endsWith(".js") && !element.endsWith(".ts"), + (element) => splitFilenameExtensions(element)?.ext === undefined, ); const player = useMainPlayer(); @@ -45,7 +45,7 @@ export default async (client: Client, isDev: boolean) => { ); // Remove extension - const { file: event_type, ext } = splitFilenameExtensions(event_file); + const { file: event_type, ext } = splitFilenameExtensions(event_file)!; if (!(ext === "js" || ext === "ts")) { throw `Unknown file in ${event_category}: ${event_file}`; } diff --git a/src/events/message/messageCreate.ts b/src/events/message/messageCreate.ts index 1803a51..c76e35c 100644 --- a/src/events/message/messageCreate.ts +++ b/src/events/message/messageCreate.ts @@ -1,4 +1,4 @@ -import { Client, EmbedBuilder, GuildMember, Message, TextBasedChannel } from "discord.js"; +import { Client, EmbedBuilder, Message, TextBasedChannel } from "discord.js"; import { getLocale } from "../../utils/locales"; import { isImage, userWithNickname } from "../../utils/misc"; import { showDate } from "../../utils/time"; @@ -146,7 +146,7 @@ export default async (message: Message, client: Client) => { if (message.author === quoted_post?.author) { author += " & Citateur"; } else { - footer += `\nCité par ${userWithNickname(message.member as GuildMember) ?? "?"} le ${showDate( + footer += `\nCité par ${userWithNickname(message.member!) ?? "?"} le ${showDate( client.config.default_lang, loc, message.createdAt, diff --git a/src/utils/misc.ts b/src/utils/misc.ts index b89db42..e2a7fd2 100644 --- a/src/utils/misc.ts +++ b/src/utils/misc.ts @@ -34,10 +34,26 @@ export const getFilename = (path: string) => { * @returns Object with filename and extension splitted */ export const splitFilenameExtensions = (filename: string) => { - const array = filename.split("."); - const ext = array.pop(); + if (filename.length === 0) { + return undefined; + } - return { file: array.join("."), ext }; + // Check if the filename starts with a dot and has no other dots + if (filename.startsWith(".") && filename.indexOf(".", 1) === -1) { + return { file: filename, ext: undefined }; + } + + const lastDotIndex = filename.lastIndexOf("."); + + // If there's no dot or the dot is at the start, treat the whole string as the filename + if (lastDotIndex <= 0) { + return { file: filename, ext: undefined }; + } + + const file = filename.slice(0, lastDotIndex); + const ext = filename.slice(lastDotIndex + 1); + + return { file, ext }; }; /** @@ -46,16 +62,7 @@ export const splitFilenameExtensions = (filename: string) => { * @returns string of the filename without an extension */ export const removeExtension = (filename: string) => { - return splitFilenameExtensions(filename).file; -}; - -/** - * Get extension from a filename - * @param filename string of the filename - * @returns string of the extension if it exists - */ -export const getExtension = (filename: string) => { - return splitFilenameExtensions(filename).ext; + return splitFilenameExtensions(filename)!.file; }; /** @@ -64,7 +71,11 @@ export const getExtension = (filename: string) => { * @returns true is file is a media */ export const isImage = (filename: string) => { - return Boolean(getExtension(filename)?.match(/jpg|jpeg|png|webp|gif/)); + return Boolean( + splitFilenameExtensions(filename) + ?.ext?.toLowerCase() + .match(/jpg|jpeg|png|webp|gif/), + ); }; /** diff --git a/src/utils/music.ts b/src/utils/music.ts index 592ae8a..da84263 100644 --- a/src/utils/music.ts +++ b/src/utils/music.ts @@ -1,5 +1,5 @@ import { EmbedBuilder } from "@discordjs/builders"; -import { GuildQueue, QueueRepeatMode, Track } from "discord-player"; +import { GuildQueue, QueueRepeatMode } from "discord-player"; import { Client } from "discord.js"; import { getLocale } from "./locales"; import { generateTrustedToken, YoutubeiExtractor } from "discord-player-youtubei"; @@ -15,7 +15,7 @@ export const embedListQueue = ( const tracks = queue.tracks.toArray(); // Add the current song at the top of the list - tracks.unshift(queue.history.currentTrack as Track); + tracks.unshift(queue.history.currentTrack!); // Limit of discord is 25 const limit_fields = 25; -- 2.45.2 From 0571b6cb857611f20af4adc6264e391addb92363 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Wed, 18 Sep 2024 18:10:31 +0200 Subject: [PATCH 09/10] be sure that we fetching directories --- src/buttons/loader.ts | 8 ++++---- src/commands/loader.ts | 8 ++++---- src/events/loader.ts | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/buttons/loader.ts b/src/buttons/loader.ts index c93897c..ef3823b 100644 --- a/src/buttons/loader.ts +++ b/src/buttons/loader.ts @@ -1,5 +1,5 @@ import { readdir } from "fs/promises"; -import { removeExtension, splitFilenameExtensions } from "../utils/misc"; +import { removeExtension } from "../utils/misc"; import { ChatInputCommandInteraction, Client, @@ -10,9 +10,9 @@ import { getLocale } from "../utils/locales"; export default async (client: Client) => { // Dossier des buttons - const buttons_categories = (await readdir(__dirname)).filter( - (element) => splitFilenameExtensions(element)?.ext === undefined, - ); + const buttons_categories = (await readdir(__dirname, { withFileTypes: true })) + .filter((element) => element.isDirectory()) + .map((element) => element.name); await Promise.all( // For each categorie diff --git a/src/commands/loader.ts b/src/commands/loader.ts index 419bef4..b8b1c24 100644 --- a/src/commands/loader.ts +++ b/src/commands/loader.ts @@ -2,15 +2,15 @@ import { REST } from "@discordjs/rest"; import { Routes } from "discord-api-types/v9"; import { Client } from "discord.js"; import { readdir } from "fs/promises"; -import { removeExtension, splitFilenameExtensions } from "../utils/misc"; +import { removeExtension } from "../utils/misc"; /** Load all the commands */ export default async (client: Client) => { const rest = new REST({ version: "10" }).setToken(client.token!); - const command_categories = (await readdir(__dirname)).filter( - (element) => splitFilenameExtensions(element)?.ext === undefined, - ); + const command_categories = (await readdir(__dirname, { withFileTypes: true })) + .filter((element) => element.isDirectory()) + .map((element) => element.name); const commands = ( await Promise.all( diff --git a/src/events/loader.ts b/src/events/loader.ts index 733784c..5557ccf 100644 --- a/src/events/loader.ts +++ b/src/events/loader.ts @@ -5,9 +5,9 @@ import { splitFilenameExtensions } from "../utils/misc"; /** Load all the events */ export default async (client: Client, isDev: boolean) => { - const events_categories = (await readdir(__dirname)).filter( - (element) => splitFilenameExtensions(element)?.ext === undefined, - ); + const events_categories = (await readdir(__dirname, { withFileTypes: true })) + .filter((element) => element.isDirectory()) + .map((element) => element.name); const player = useMainPlayer(); -- 2.45.2 From a364b85002661522a4fbc91d65982ac2cd58494d Mon Sep 17 00:00:00 2001 From: Mylloon Date: Wed, 18 Sep 2024 18:13:31 +0200 Subject: [PATCH 10/10] do not set rich presence in dev mode --- src/load.ts | 2 +- src/utils/client.ts | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/load.ts b/src/load.ts index 5f59ec7..13277c3 100644 --- a/src/load.ts +++ b/src/load.ts @@ -12,7 +12,7 @@ export const run = async (isDev: boolean) => { // Client Discord.JS const client_name = "Client"; - await loadClient() + await loadClient(isDev) .then(async (client) => { if (isDev) { // Attach debugging listeners diff --git a/src/utils/client.ts b/src/utils/client.ts index a288919..1893ded 100644 --- a/src/utils/client.ts +++ b/src/utils/client.ts @@ -8,7 +8,9 @@ import { YoutubeiExtractor } from "discord-player-youtubei"; import { YoutubeWebTokenRoutine } from "./music"; /** Creation of the client and definition of its properties */ -export default async () => { +export default async (isDev: boolean) => { + const activities = isDev ? [] : [{ name: "/help", type: ActivityType.Watching }]; + const client: Client = new Client({ shards: "auto", intents: [ @@ -18,7 +20,7 @@ export default async () => { GatewayIntentBits.GuildVoiceStates, ], presence: { - activities: [{ name: "/help", type: ActivityType.Watching }], + activities, }, }); -- 2.45.2