chore: use @stegripe/eslint-config

.gitignore

@@ -103,3 +103,4 @@ dist
 # Rawon cache directories and files
 data.json
 scripts/
+play-dl-fix/

eslint.config.js

@@ -0,0 +1,17 @@
+import nodePath from "node:path";
+import { fileURLToPath } from "node:url";
+import { includeIgnoreFile } from "@eslint/compat";
+import { common, modules, node, prettier, typescript, extend, ignores } from "@stegripe/eslint-config";
+
+const gitIgnore = nodePath.resolve(fileURLToPath(import.meta.url), "..", ".gitignore");
+
+export default [...common, ...modules, ...node, ...prettier, ...extend(typescript, [{
+    rule: "typescript/no-unnecessary-condition",
+    option: ["off"]
+}], ...ignores), includeIgnoreFile(gitIgnore), {
+    ignores: [
+        "yt-dlp-utils/*",
+        "play-dl-importer/*",
+        "play-dl-fix/*"
+    ]
+}];

index.js

@@ -1,10 +1,11 @@
-import { downloadExecutable } from "./yt-dlp-utils/index.js";
-import { existsSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+/* eslint-disable node/no-sync */
 import { execSync } from "node:child_process";
-import { resolve } from "node:path";
+import { existsSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { Server } from "node:http";
-import module from "node:module";
+import nodePath from "node:path";
+import process from "node:process";
 import prism from "prism-media";
+import { downloadExecutable } from "./yt-dlp-utils/index.js";
 
 const ensureEnv = arr => arr.every(x => process.env[x] !== undefined);
 
@@ -36,7 +37,7 @@ const isGitHub = ensureEnv([
 
 function npmInstall(deleteDir = false, forceInstall = false, additionalArgs = []) {
     if (deleteDir) {
-        const modulesPath = resolve(process.cwd(), "node_modules");
+        const modulesPath = nodePath.resolve(process.cwd(), "node_modules");
 
         if (existsSync(modulesPath)) {
             rmSync(modulesPath, {
@@ -50,7 +51,7 @@ function npmInstall(deleteDir = false, forceInstall = false, additionalArgs = []
 }
 
 if (isGlitch) {
-    const gitIgnorePath = resolve(process.cwd(), ".gitignore");
+    const gitIgnorePath = nodePath.resolve(process.cwd(), ".gitignore");
     try {
         const data = readFileSync(gitIgnorePath, "utf8").toString();
         if (data.includes("dev.env")) {
@@ -65,7 +66,7 @@ if (isGlitch) {
         console.info("[INFO] Trying to re-install modules...");
         npmInstall();
         console.info("[INFO] Modules successfully re-installed.");
-    } catch (err) {
+    } catch {
         console.info("[INFO] Failed to re-install modules, trying to delete node_modules and re-install...");
         try {
             npmInstall(true);
@@ -86,8 +87,6 @@ if (isGitHub) {
     console.warn("[WARN] Running this bot using GitHub is not recommended.");
 }
 
-const require = module.createRequire(import.meta.url);
-
 try {
     prism.FFmpeg.getInfo(true);
 } catch {
@@ -100,7 +99,7 @@ if (isGlitch || isReplit) {
     new Server((req, res) => {
         const now = new Date().toLocaleString("en-US");
         res.end(`OK (200) - ${now}`);
-    }).listen(Number(process.env.PORT || 3000) || 3000);
+    }).listen(Number(process.env.PORT || 3_000) || 3_000);
 
     console.info(`[INFO] ${isGlitch ? "Glitch" : "Replit"} environment detected, trying to compile...`);
     execSync(`npm run compile`);
@@ -109,14 +108,15 @@ if (isGlitch || isReplit) {
 
 const streamStrategy = process.env.STREAM_STRATEGY;
 if (streamStrategy !== "play-dl") await downloadExecutable();
-if (streamStrategy === "play-dl") {
-    try {
-        require("play-dl");
-    } catch {
-        console.info("[INFO] Installing play-dl...");
-        npmInstall(false, false, ["play-dl"]);
-        console.info("[INFO] Play-dl has been installed.");
-    }
+if (streamStrategy === "play-dl" && !existsSync(nodePath.resolve(process.cwd(), "play-dl-fix"))) {
+    console.log("[INFO] Cloning play-dl fix...");
+    execSync("git clone https://github.com/YuzuZensai/play-dl-test.git play-dl-fix && cd play-dl-fix && git reset --hard 2bfbfe6");
+
+    console.log("[INFO] Installing packages for play-dl...");
+    execSync("cd play-dl-fix && npm install");
+
+    console.log("[INFO] Compiling play-dl...");
+    execSync("cd play-dl-fix && npm run build");
 }
 console.info("[INFO] Starting the bot...");
 

package.json

@@ -18,8 +18,8 @@
         "build": "npm run lint && npm run compile",
         "compile": "npx swc src -d dist --strip-leading-paths",
         "tscompile": "tsc --build tsconfig.json",
-        "lint": "eslint . --cache --cache-file .eslintcache --ignore-path .gitignore --ext .ts",
-        "lint:fix": "eslint . --cache --cache-file .eslintcache --ignore-path .gitignore --ext .ts --fix",
+        "lint": "eslint . --cache --cache-file .eslintcache",
+        "lint:fix": "eslint . --cache --cache-file .eslintcache --fix",
         "pretty": "prettier --check src/**/*.ts",
         "pretty:write": "prettier --write src/**/*.ts",
         "start": "node --es-module-specifier-resolution=node -r dotenv/config .",
@@ -35,23 +35,6 @@
         "arrowParens": "avoid",
         "printWidth": 120
     },
-    "eslintConfig": {
-        "extends": [
-            "@clytage/eslint-config/typescript",
-            "prettier"
-        ],
-        "plugins": [
-            "prettier"
-        ],
-        "ignorePatterns": [
-            "dist/*",
-            "index.js",
-            "yt-dlp-utils/"
-        ],
-        "rules": {
-            "@typescript-eslint/no-extra-parens": "off"
-        }
-    },
     "dependencies": {
         "@discordjs/voice": "^0.17.0",
         "@swc/cli": "0.4.0",
@@ -69,12 +52,11 @@
         "youtubei": "1.5.4"
     },
     "devDependencies": {
-        "@clytage/eslint-config": "^3.0.1",
+        "@eslint/compat": "^1.1.1",
+        "@stegripe/eslint-config": "^1.0.1",
         "@types/i18n": "0.13.12",
         "@types/node": "20.14.11",
-        "@typescript-eslint/eslint-plugin": "6.18.1",
-        "@typescript-eslint/parser": "6.18.1",
-        "eslint": "8.56.0",
+        "eslint": "9.7.0",
         "eslint-config-prettier": "^9.1.0",
         "eslint-plugin-prettier": "^5.1.3",
         "prettier": "^3.3.3",

play-dl-importer/index.d.ts

@@ -0,0 +1,14 @@
+import { Readable } from "node:stream";
+
+export default {
+    stream: async (url: string, options: { discordPlayerCompatibility: boolean }): Promise<{ stream: Readable }> => {},
+    video_basic_info: async (url: string): Promise<{
+        video_details: {
+            durationInSec: number;
+            id: string | null;
+            thumbnails: { url: string; width: number; height: number }[];
+            title: string | null;
+            url: string;
+        }
+    }> => {}
+};

play-dl-importer/index.js

@@ -0,0 +1,16 @@
+import { existsSync } from "node:fs";
+import module from "node:module";
+import nodePath from "node:path";
+import { fileURLToPath } from "node:url";
+
+// eslint-disable-next-line import/no-mutable-exports
+let mod;
+
+if (existsSync(nodePath.resolve(fileURLToPath(import.meta.url), "..", "..", "play-dl-fix"))) {
+    mod = await import("../play-dl-fix/dist/index.mjs");
+} else {
+    const require = module.createRequire(nodePath.resolve(fileURLToPath(import.meta.url), ".."));
+    mod = require("play-dl");
+}
+
+export default mod;