From 59fbb976cbbe476e1ec4698c58a46f842ea69e1b Mon Sep 17 00:00:00 2001 From: ITOH Date: Tue, 11 May 2021 20:08:57 +0200 Subject: [PATCH] use WebsocketRequest for type --- src/ws/events.ts | 24 ++++++++++++------------ src/ws/process_queue.ts | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/ws/events.ts b/src/ws/events.ts index 5c9dffca4..e0780ac45 100644 --- a/src/ws/events.ts +++ b/src/ws/events.ts @@ -1,48 +1,48 @@ import type { DiscordGatewayPayload } from "../types/gateway/gateway_payload.ts"; -import { DiscordenoShard } from "./ws.ts"; +import { DiscordenoShard, WebSocketRequest } from "./ws.ts"; /** The handler for logging different actions happening inside the ws. User can override and put custom handling per event. */ export function log( type: "CLOSED", - data: { shardId: number; payload: CloseEvent }, + data: { shardId: number; payload: CloseEvent } ): unknown; export function log( type: "CLOSED_RECONNECT", - data: { shardId: number; payload: CloseEvent }, + data: { shardId: number; payload: CloseEvent } ): unknown; export function log( type: "ERROR", - data: Record & { shardId: number }, + data: Record & { shardId: number } ): unknown; export function log( type: "HEARTBEATING", - data: { shardId: number; shard: DiscordenoShard }, + data: { shardId: number; shard: DiscordenoShard } ): unknown; export function log( type: "HEARTBEATING_CLOSED", - data: { shardId: number; shard: DiscordenoShard }, + data: { shardId: number; shard: DiscordenoShard } ): unknown; export function log( type: "HEARTBEATING_DETAILS", - data: { shardId: number; interval: number; shard: DiscordenoShard }, + data: { shardId: number; interval: number; shard: DiscordenoShard } ): unknown; export function log( type: "HEARTBEATING_STARTED", - data: { shardId: number; interval: number }, + data: { shardId: number; interval: number } ): unknown; export function log( type: "IDENTIFYING", - data: { shardId: number; maxShards: number }, + data: { shardId: number; maxShards: number } ): unknown; export function log( type: "INVALID_SESSION", - data: { shardId: number; payload: DiscordGatewayPayload }, + data: { shardId: number; payload: DiscordGatewayPayload } ): unknown; export function log(type: "RAW", data: Record): unknown; export function log( type: "RAW_SEND", shardId: number, - data: Record, + data: WebSocketRequest ): unknown; export function log(type: "RECONNECT", data: { shardId: number }): unknown; export function log(type: "RESUMED", data: { shardId: number }): unknown; @@ -65,7 +65,7 @@ export function log( | "RESUMED" | "RESUMING" | "DEBUG", - data: unknown, + data: unknown ) { // This is just a placeholder for the dev to override if (!type && !data) console.log(type, data); diff --git a/src/ws/process_queue.ts b/src/ws/process_queue.ts index 9ba5f167c..45277b5d6 100644 --- a/src/ws/process_queue.ts +++ b/src/ws/process_queue.ts @@ -34,11 +34,11 @@ export async function processQueue(id: number) { : Array.isArray(value) ? value.map((v) => (typeof v === "bigint" ? v.toString() : v)) : value, - `Running forEach loop in ws.processQueue function for changing bigints to strings.`, + `Running forEach loop in ws.processQueue function for changing bigints to strings.` ); } - ws.log("RAW_SEND", shard.id, { ...request }); + ws.log("RAW_SEND", shard.id, request); shard.ws.send(JSON.stringify(request));