chore: improve linting (#7244)

packages/voice/src/util/Secretbox.ts

@@ -1,28 +1,37 @@
 interface Methods {
-	open(buffer: Buffer, nonce: Buffer, secretKey: Uint8Array): Buffer | null;
-	close(opusPacket: Buffer, nonce: Buffer, secretKey: Uint8Array): Buffer;
-	random(bytes: number, nonce: Buffer): Buffer;
+	open: (buffer: Buffer, nonce: Buffer, secretKey: Uint8Array) => Buffer | null;
+	close: (opusPacket: Buffer, nonce: Buffer, secretKey: Uint8Array) => Buffer;
+	random: (bytes: number, nonce: Buffer) => Buffer;
 }
 
 const libs = {
 	sodium: (sodium: any): Methods => ({
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
 		open: sodium.api.crypto_secretbox_open_easy,
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
 		close: sodium.api.crypto_secretbox_easy,
 		random: (n: any, buffer?: Buffer) => {
 			// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 			if (!buffer) buffer = Buffer.allocUnsafe(n);
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
 			sodium.api.randombytes_buf(buffer);
 			return buffer;
 		},
 	}),
 	'libsodium-wrappers': (sodium: any): Methods => ({
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
 		open: sodium.crypto_secretbox_open_easy,
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
 		close: sodium.crypto_secretbox_easy,
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
 		random: (n: any) => sodium.randombytes_buf(n),
 	}),
 	tweetnacl: (tweetnacl: any): Methods => ({
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
 		open: tweetnacl.secretbox.open,
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
 		close: tweetnacl.secretbox,
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
 		random: (n: any) => tweetnacl.randomBytes(n),
 	}),
 } as const;
@@ -46,6 +55,7 @@ void (async () => {
 		try {
 			// eslint-disable-next-line
 			const lib = require(libName);
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 			if (libName === 'libsodium-wrappers' && lib.ready) await lib.ready;
 			Object.assign(methods, libs[libName](lib));
 			break;

packages/voice/src/util/__tests__/demuxProbe.test.ts

@@ -1,3 +1,6 @@
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { demuxProbe } from '../demuxProbe';
 import { opus as _opus } from 'prism-media';
 import { Readable } from 'node:stream';
@@ -9,6 +12,10 @@ jest.mock('prism-media');
 const WebmDemuxer = _opus.WebmDemuxer as unknown as jest.Mock<_opus.WebmDemuxer>;
 const OggDemuxer = _opus.OggDemuxer as unknown as jest.Mock<_opus.OggDemuxer>;
 
+function nextTick() {
+	return new Promise((resolve) => process.nextTick(resolve));
+}
+
 async function* gen(n: number) {
 	for (let i = 0; i < n; i++) {
 		yield Buffer.from([i]);
@@ -37,10 +44,6 @@ async function collectStream(stream: Readable): Promise<Buffer> {
 	return output;
 }
 
-function nextTick() {
-	return new Promise((resolve) => process.nextTick(resolve));
-}
-
 describe('demuxProbe', () => {
 	const webmWrite: jest.Mock<(buffer: Buffer) => void> = jest.fn();
 	const oggWrite: jest.Mock<(buffer: Buffer) => void> = jest.fn();

packages/voice/src/util/__tests__/entersState.test.ts

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import EventEmitter from 'node:events';
 import { VoiceConnection, VoiceConnectionStatus } from '../../VoiceConnection';
 import { entersState } from '../entersState';

packages/voice/src/util/abortAfter.ts

@@ -6,7 +6,8 @@
 export function abortAfter(delay: number): [AbortController, AbortSignal] {
 	const ac = new AbortController();
 	const timeout = setTimeout(() => ac.abort(), delay);
-	// @ts-ignore
+	// @ts-expect-error
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-call
 	ac.signal.addEventListener('abort', () => clearTimeout(timeout));
 	return [ac, ac.signal];
 }

packages/voice/src/util/adapter.ts

@@ -10,17 +10,17 @@ export interface DiscordGatewayAdapterLibraryMethods {
 	 *
 	 * @param data - The inner data of the VOICE_SERVER_UPDATE payload
 	 */
-	onVoiceServerUpdate(data: GatewayVoiceServerUpdateDispatchData): void;
+	onVoiceServerUpdate: (data: GatewayVoiceServerUpdateDispatchData) => void;
 	/**
 	 * Call this when you receive a VOICE_STATE_UPDATE payload that is relevant to the adapter.
 	 *
 	 * @param data - The inner data of the VOICE_STATE_UPDATE payload
 	 */
-	onVoiceStateUpdate(data: GatewayVoiceStateUpdateDispatchData): void;
+	onVoiceStateUpdate: (data: GatewayVoiceStateUpdateDispatchData) => void;
 	/**
 	 * Call this when the adapter can no longer be used (e.g. due to a disconnect from the main gateway)
 	 */
-	destroy(): void;
+	destroy: () => void;
 }
 
 /**
@@ -34,12 +34,12 @@ export interface DiscordGatewayAdapterImplementerMethods {
 	 *
 	 * @returns `false` if the payload definitely failed to send - in this case, the voice connection disconnects
 	 */
-	sendPayload(payload: any): boolean;
+	sendPayload: (payload: any) => boolean;
 	/**
 	 * This will be called by @discordjs/voice when the adapter can safely be destroyed as it will no
 	 * longer be used.
 	 */
-	destroy(): void;
+	destroy: () => void;
 }
 
 /**

packages/voice/src/util/demuxProbe.ts

@@ -56,8 +56,11 @@ export function demuxProbe(
 		let resolved: StreamType | undefined = undefined;
 
 		const finish = (type: StreamType) => {
+			// eslint-disable-next-line @typescript-eslint/no-use-before-define
 			stream.off('data', onData);
+			// eslint-disable-next-line @typescript-eslint/no-use-before-define
 			stream.off('close', onClose);
+			// eslint-disable-next-line @typescript-eslint/no-use-before-define
 			stream.off('end', onClose);
 			stream.pause();
 			resolved = type;

packages/voice/src/util/generateDependencyReport.ts

@@ -3,6 +3,51 @@
 import { resolve, dirname } from 'node:path';
 import prism from 'prism-media';
 
+/**
+ * Tries to find the package.json file for a given module.
+ *
+ * @param dir - The directory to look in
+ * @param packageName - The name of the package to look for
+ * @param depth - The maximum recursion depth
+ */
+function findPackageJSON(
+	dir: string,
+	packageName: string,
+	depth: number,
+): { name: string; version: string } | undefined {
+	if (depth === 0) return undefined;
+	const attemptedPath = resolve(dir, './package.json');
+	try {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+		const pkg = require(attemptedPath);
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+		if (pkg.name !== packageName) throw new Error('package.json does not match');
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+		return pkg;
+	} catch (err) {
+		return findPackageJSON(resolve(dir, '..'), packageName, depth - 1);
+	}
+}
+
+/**
+ * Tries to find the version of a dependency.
+ *
+ * @param name - The package to find the version of
+ */
+function version(name: string): string {
+	try {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+		const pkg =
+			name === '@discordjs/voice'
+				? require('../../package.json')
+				: findPackageJSON(dirname(require.resolve(name)), name, 3);
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access
+		return pkg?.version ?? 'not found';
+	} catch (err) {
+		return 'not found';
+	}
+}
+
 /**
  * Generates a report of the dependencies used by the \@discordjs/voice module.
  * Useful for debugging.
@@ -41,43 +86,3 @@ export function generateDependencyReport() {
 
 	return ['-'.repeat(50), ...report, '-'.repeat(50)].join('\n');
 }
-
-/**
- * Tries to find the package.json file for a given module.
- *
- * @param dir - The directory to look in
- * @param packageName - The name of the package to look for
- * @param depth - The maximum recursion depth
- */
-function findPackageJSON(
-	dir: string,
-	packageName: string,
-	depth: number,
-): { name: string; version: string } | undefined {
-	if (depth === 0) return undefined;
-	const attemptedPath = resolve(dir, './package.json');
-	try {
-		const pkg = require(attemptedPath);
-		if (pkg.name !== packageName) throw new Error('package.json does not match');
-		return pkg;
-	} catch (err) {
-		return findPackageJSON(resolve(dir, '..'), packageName, depth - 1);
-	}
-}
-
-/**
- * Tries to find the version of a dependency.
- *
- * @param name - The package to find the version of
- */
-function version(name: string): string {
-	try {
-		const pkg =
-			name === '@discordjs/voice'
-				? require('../../package.json')
-				: findPackageJSON(dirname(require.resolve(name)), name, 3);
-		return pkg?.version ?? 'not found';
-	} catch (err) {
-		return 'not found';
-	}
-}