diff --git a/packages/api/src/classes/Client.ts b/packages/api/src/classes/Client.ts index 5558a41..245fb91 100755 --- a/packages/api/src/classes/Client.ts +++ b/packages/api/src/classes/Client.ts @@ -62,9 +62,7 @@ export default class Client { rs(packet.d) } - const parseTextFailedListener = ( - packet: Packet, - ) => { + const parseTextFailedListener = (packet: Packet) => { if (packet.d.id !== currentId) return this.gateway.off('parseTextFailed', parseTextFailedListener) rj() @@ -104,9 +102,7 @@ export default class Client { rs(packet.d) } - const parseImageFailedListener = ( - packet: Packet, - ) => { + const parseImageFailedListener = (packet: Packet) => { if (packet.d.id !== currentId) return this.gateway.off('parseImageFailed', parseImageFailedListener) rj() @@ -125,10 +121,7 @@ export default class Client { * @param handler The event handler * @returns The event handler function */ - on( - name: TOpName, - handler: ClientGatewayEventHandlers[TOpName], - ) { + on(name: TOpName, handler: ClientGatewayEventHandlers[TOpName]) { this.gateway.on(name, handler) return handler } @@ -139,10 +132,7 @@ export default class Client { * @param handler The event handler to remove * @returns The removed event handler function */ - off( - name: TOpName, - handler: ClientGatewayEventHandlers[TOpName], - ) { + off(name: TOpName, handler: ClientGatewayEventHandlers[TOpName]) { this.gateway.off(name, handler) return handler } diff --git a/packages/api/src/classes/ClientGateway.ts b/packages/api/src/classes/ClientGateway.ts index 5ca560f..8d01271 100755 --- a/packages/api/src/classes/ClientGateway.ts +++ b/packages/api/src/classes/ClientGateway.ts @@ -44,9 +44,7 @@ export default class ClientGateway { rs() }) - this.#socket.on('close', () => - this.#handleDisconnect(DisconnectReason.Generic), - ) + this.#socket.on('close', () => this.#handleDisconnect(DisconnectReason.Generic)) this.#listen() this.ready = true @@ -102,14 +100,10 @@ export default class ClientGateway { * @returns A promise that resolves when the packet has been sent */ send(packet: Packet) { - this.#throwIfDisconnected( - 'Cannot send a packet when already disconnected from the server', - ) + this.#throwIfDisconnected('Cannot send a packet when already disconnected from the server') return new Promise((resolve, reject) => - this.#socket.send(serializePacket(packet), err => - err ? reject(err) : resolve(), - ), + this.#socket.send(serializePacket(packet), err => (err ? reject(err) : resolve())), ) } @@ -117,9 +111,7 @@ export default class ClientGateway { * Disconnects from the WebSocket API */ disconnect() { - this.#throwIfDisconnected( - 'Cannot disconnect when already disconnected from the server', - ) + this.#throwIfDisconnected('Cannot disconnect when already disconnected from the server') this.#handleDisconnect(DisconnectReason.Generic) } @@ -144,25 +136,17 @@ export default class ClientGateway { switch (packet.op) { case ServerOperation.Hello: { // eslint-disable-next-line no-case-declarations - const data = Object.freeze( - (packet as Packet).d, - ) + const data = Object.freeze((packet as Packet).d) this.config = data this.#emitter.emit('hello', data) this.#startHeartbeating() break } case ServerOperation.Disconnect: - return this.#handleDisconnect( - (packet as Packet).d.reason, - ) + return this.#handleDisconnect((packet as Packet).d.reason) default: return this.#emitter.emit( - uncapitalize( - ServerOperation[ - packet.op - ] as ClientGatewayServerEventName, - ), + uncapitalize(ServerOperation[packet.op] as ClientGatewayServerEventName), // @ts-expect-error TypeScript doesn't know that the lines above negate the type enough packet, ) @@ -172,8 +156,7 @@ export default class ClientGateway { #throwIfDisconnected(errorMessage: string) { if (this.disconnected !== false) throw new Error(errorMessage) - if (this.#socket.readyState !== this.#socket.OPEN) - throw new Error(errorMessage) + if (this.#socket.readyState !== this.#socket.OPEN) throw new Error(errorMessage) } #handleDisconnect(reason: DisconnectReason) { @@ -222,14 +205,10 @@ export type ClientGatewayEventHandlers = { packet: Packet]>, ) => Promise | void } & { - hello: ( - config: NonNullable, - ) => Promise | void + hello: (config: NonNullable) => Promise | void ready: () => Promise | void packet: (packet: Packet) => Promise | void disconnect: (reason: DisconnectReason) => Promise | void } -export type ReadiedClientGateway = RequiredProperty< - InstanceType -> +export type ReadiedClientGateway = RequiredProperty>