refactor(apis/websocket): clean up imports, format, and fix issues

apis/websocket/src/classes/Client.ts

@@ -1,4 +1,4 @@
-import { EventEmitter } from 'node:events'
+import { EventEmitter } from 'events'
 import {
     ClientOperation,
     DisconnectReason,
@@ -167,8 +167,8 @@ export default class Client {
 
     protected _toBuffer(data: RawData) {
         if (data instanceof Buffer) return data
-        else if (data instanceof ArrayBuffer) return Buffer.from(data)
-        else return Buffer.concat(data)
+        if (data instanceof ArrayBuffer) return Buffer.from(data)
+        return Buffer.concat(data)
     }
 }
 
@@ -186,7 +186,7 @@ export type ClientEventName = keyof typeof ClientOperation
 
 export type ClientEventHandlers = {
     [K in Uncapitalize<ClientEventName>]: (
-        packet: ClientPacketObject<typeof ClientOperation[Capitalize<K>]>,
+        packet: ClientPacketObject<(typeof ClientOperation)[Capitalize<K>]>,
     ) => Promise<unknown> | unknown
 } & {
     ready: () => Promise<unknown> | unknown

apis/websocket/src/events/index.ts

@@ -1,12 +1,12 @@
 import type { ClientOperation } from '@revanced/bot-shared'
+import type { Logger } from '@revanced/bot-shared'
 import type { Wit } from 'node-wit'
 import type { Worker as TesseractWorker } from 'tesseract.js'
-import { ClientPacketObject } from '../classes/Client.js'
-import type { Config } from '../utils/getConfig.js'
-import type { Logger } from '@revanced/bot-shared'
+import { ClientPacketObject } from '../classes/Client'
+import type { Config } from '../utils/getConfig'
 
-export { default as parseTextEventHandler } from './parseText.js'
-export { default as parseImageEventHandler } from './parseImage.js'
+export { default as parseTextEventHandler } from './parseText'
+export { default as parseImageEventHandler } from './parseImage'
 
 export type EventHandler<POp extends ClientOperation> = (
     packet: ClientPacketObject<POp>,

apis/websocket/src/events/parseImage.ts

@@ -1,7 +1,7 @@
 import { ClientOperation, ServerOperation } from '@revanced/bot-shared'
 import { AsyncQueue } from '@sapphire/async-queue'
 
-import type { EventHandler } from './index.js'
+import type { EventHandler } from './index'
 
 const queue = new AsyncQueue()
 

apis/websocket/src/events/parseText.ts

@@ -1,8 +1,8 @@
 import { ClientOperation, ServerOperation } from '@revanced/bot-shared'
 
-import { inspect as inspectObject } from 'node:util'
+import { inspect as inspectObject } from 'util'
 
-import type { EventHandler } from './index.js'
+import type { EventHandler } from './index'
 
 const parseTextEventHandler: EventHandler<ClientOperation.ParseText> = async (packet, { witClient, logger }) => {
     const {
@@ -14,7 +14,6 @@ const parseTextEventHandler: EventHandler<ClientOperation.ParseText> = async (pa
 
     try {
         const { intents } = await witClient.message(text, {})
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const intentsWithoutIds = intents.map(({ id, ...rest }) => rest)
 
         await client.send({

apis/websocket/src/index.ts

@@ -5,15 +5,15 @@ import witPkg from 'node-wit'
 import { createWorker as createTesseractWorker } from 'tesseract.js'
 const { Wit } = witPkg
 
-import { inspect as inspectObject } from 'node:util'
+import { inspect as inspectObject } from 'util'
 
-import Client from './classes/Client.js'
+import Client from './classes/Client'
 
-import { EventContext, parseImageEventHandler, parseTextEventHandler } from './events/index.js'
+import { EventContext, parseImageEventHandler, parseTextEventHandler } from './events/index'
 
 import { DisconnectReason, HumanizedDisconnectReason, createLogger } from '@revanced/bot-shared'
 import { WebSocket } from 'ws'
-import { checkEnvironment, getConfig } from './utils/index.js'
+import { checkEnvironment, getConfig } from './utils/index'
 
 // Load config, init logger, check environment
 
@@ -31,9 +31,6 @@ const witClient = new Wit({
     accessToken: process.env['WIT_AI_TOKEN']!,
 })
 
-logger.fatal('test')
-logger.error('test')
-
 // Server logic
 
 const clients = new Set<Client>()

apis/websocket/src/utils/getConfig.ts

@@ -1,6 +1,6 @@
-import { existsSync } from 'node:fs'
-import { resolve as resolvePath } from 'node:path'
-import { pathToFileURL } from 'node:url'
+import { existsSync } from 'fs'
+import { resolve as resolvePath } from 'path'
+import { pathToFileURL } from 'url'
 
 const configPath = resolvePath(process.cwd(), 'config.json')
 
@@ -17,10 +17,10 @@ const userConfig: Partial<Config> = existsSync(configPath)
 type BaseTypeOf<T> = T extends (infer U)[]
     ? U[]
     : T extends (...args: unknown[]) => infer U
-    ? (...args: unknown[]) => U
-    : T extends object
-    ? { [K in keyof T]: T[K] }
-    : T
+      ? (...args: unknown[]) => U
+      : T extends object
+          ? { [K in keyof T]: T[K] }
+          : T
 
 export type Config = Omit<BaseTypeOf<typeof import('../../config.json')>, '$schema'>
 

apis/websocket/src/utils/index.ts

@@ -1,2 +1,2 @@
-export { default as getConfig } from './getConfig.js'
-export { default as checkEnvironment } from './checkEnvironment.js'
+export { default as getConfig } from './getConfig'
+export { default as checkEnvironment } from './checkEnvironment'