diff --git a/src/events/Connection.ts b/src/events/Connection.ts
index f0c433f7..0c4dd2b8 100644
--- a/src/events/Connection.ts
+++ b/src/events/Connection.ts
@@ -5,7 +5,6 @@ import { Message } from "./Message";
import { setHeartbeat } from "../util/setHeartbeat";
import { Send } from "../util/Send";
import { CLOSECODES, OPCODES } from "../util/Constants";
-import { setupListener } from "../listener/listener";
// TODO: check rate limit
// TODO: specify rate limit in config
@@ -37,8 +36,6 @@ export async function Connection(this: Server, socket: WebSocket, request: Incom
},
});
- await setupListener.call(socket);
-
socket.readyTimeout = setTimeout(() => {
return socket.close(CLOSECODES.Session_timed_out);
}, 1000 * 30);
diff --git a/src/events/Message.ts b/src/events/Message.ts
index bc497e94..b72fd75f 100644
--- a/src/events/Message.ts
+++ b/src/events/Message.ts
@@ -18,7 +18,8 @@ export async function Message(this: WebSocket, buffer: Data) {
try {
if (this.encoding === "etf" && buffer instanceof Buffer) data = erlpack.unpack(buffer);
else if (this.encoding === "json" && typeof buffer === "string") data = JSON.parse(buffer);
- if (!instanceOf(PayloadSchema, data)) throw "invalid data";
+ const result = instanceOf(PayloadSchema, data);
+ if (result !== true) throw "invalid data";
} catch (error) {
return this.close(CLOSECODES.Decode_error);
}
diff --git a/src/opcodes/Heartbeat.ts b/src/opcodes/Heartbeat.ts
index d7e7fb5f..90a40230 100644
--- a/src/opcodes/Heartbeat.ts
+++ b/src/opcodes/Heartbeat.ts
@@ -1,4 +1,4 @@
-import { Payload } from "../util/Constants";
+import { CLOSECODES, Payload } from "../util/Constants";
import { Send } from "../util/Send";
import { setHeartbeat } from "../util/setHeartbeat";
import WebSocket from "../util/WebSocket";
diff --git a/src/opcodes/PresenceUpdate.ts b/src/opcodes/PresenceUpdate.ts
index 95cf2306..e6a389ba 100644
--- a/src/opcodes/PresenceUpdate.ts
+++ b/src/opcodes/PresenceUpdate.ts
@@ -1,4 +1,6 @@
-import { Payload } from "../util/Constants";
+import { CLOSECODES, Payload } from "../util/Constants";
import WebSocket from "../util/WebSocket";
-export function onPresenceUpdate(this: WebSocket, data: Payload) {}
+export function onPresenceUpdate(this: WebSocket, data: Payload) {
+ return this.close(CLOSECODES.Unknown_error);
+}
diff --git a/src/opcodes/RequestGuildMembers.ts b/src/opcodes/RequestGuildMembers.ts
index 38be738a..d7cecd3f 100644
--- a/src/opcodes/RequestGuildMembers.ts
+++ b/src/opcodes/RequestGuildMembers.ts
@@ -1,5 +1,7 @@
-import { Payload } from "../util/Constants";
+import { CLOSECODES, Payload } from "../util/Constants";
import WebSocket from "../util/WebSocket";
-export function onRequestGuildMembers(this: WebSocket, data: Payload) {}
+export function onRequestGuildMembers(this: WebSocket, data: Payload) {
+ return this.close(CLOSECODES.Unknown_error);
+}
diff --git a/src/opcodes/Resume.ts b/src/opcodes/Resume.ts
index 57a9a033..dd641e57 100644
--- a/src/opcodes/Resume.ts
+++ b/src/opcodes/Resume.ts
@@ -1,4 +1,4 @@
-import { Payload } from "../util/Constants";
+import { CLOSECODES, Payload } from "../util/Constants";
import WebSocket from "../util/WebSocket";
diff --git a/src/opcodes/VoiceStateUpdate.ts b/src/opcodes/VoiceStateUpdate.ts
index e602f652..584cbfd0 100644
--- a/src/opcodes/VoiceStateUpdate.ts
+++ b/src/opcodes/VoiceStateUpdate.ts
@@ -1,4 +1,4 @@
-import { Payload } from "../util/Constants";
+import { CLOSECODES, Payload } from "../util/Constants";
import WebSocket from "../util/WebSocket";
|
