From 7279df5efbb785e8353c65c793fbce41c4f86859 Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Tue, 6 Apr 2021 14:15:13 +0200
Subject: [PATCH] :bug: fix hearbeat gateway

---
 package-lock.json         | Bin 110191 -> 110191 bytes
 package.json              |   2 +-
 src/events/Message.ts     |  15 +++++++--------
 src/opcodes/Heartbeat.ts  |   4 ++--
 src/opcodes/Resume.ts     |   2 +-
 src/opcodes/instanceOf.ts |   1 +
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bf6d8cc1015e1b0b0bfeaba3c619b15d6f2dfd16..aad08fefcefe7cf996f4cfa093ca0c3bd2b1f3e2 100644
GIT binary patch
delta 355
zcmaEVhwc3xwhi+br%Pxu>TW*G*yyfqmX?&3oS1BwlxS|0m||#TY;Is+VPs-zY?^GC
zYG7_=XlamUVrD#XsqysZ8jS6eA29Q7w(`0qGx_o>{pqESj4IPvsu^V_3-GaoRwWrG
z2AOyzIhB~Z8XBiWg}D2eR_16|`G;wj6q>nbmSq~b<YYR!rnsd9q~!ZKWd@m;RT-G1
zxa6f4mzsH$__?GdMI@#9S{nN1RFr%ATWb5{6;2L3uCVz}deQ+6B3){*y-kDhfCRnV
UH$8AR(EESVS8c!I#5g+}0D<s#LI3~&

delta 345
zcmaEVhwc3xwhi+b8O=7&XI$&9k!WFIVQ6BWl9p^@Vs2=VWRPl}Y;KTZV3K5>XklWQ
zXlP-WmSk?2GI5#F^yeCk?UNrc^KQ2Cx+OE+$c#~cdZ{C$%H)l#3ZW@}X~DTw>7}XK
zPUUVvNzU$N!4<w4PM#6&#RdM!ZY4%VhG~vz#w95ME*@p+QISS@r7lj%u8xsze$Gab
zmBy73NfnuHDPfh_ZsCDt6)r(Vp%o>QAL=M<{*#_`fM{oKZ_{8rAVCkeO<!opC^Pv_
N`l{_$oET?k0{~;6cKZMT

diff --git a/package.json b/package.json
index cf1923cc..b10042c5 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
 		"fosscord-server-util": "github:fosscord/fosscord-server-util",
 		"jsonwebtoken": "^8.5.1",
 		"lambert-db": "^1.1.8",
-		"lambert-server": "^1.1.6",
+		"lambert-server": "^1.1.7",
 		"missing-native-js-functions": "^1.2.3",
 		"node-fetch": "^2.6.1",
 		"uuid": "^8.3.2",
diff --git a/src/events/Message.ts b/src/events/Message.ts
index 6aa62a22..2d461e1d 100644
--- a/src/events/Message.ts
+++ b/src/events/Message.ts
@@ -3,6 +3,7 @@ import erlpack from "erlpack";
 import OPCodeHandlers from "../opcodes";
 import { Payload, CLOSECODES } from "../util/Constants";
 import { instanceOf, Tuple } from "lambert-server";
+import { check } from "../opcodes/instanceOf";
 
 const PayloadSchema = {
 	op: Number,
@@ -15,14 +16,12 @@ export async function Message(this: WebSocket, buffer: Data) {
 	// TODO: compression
 	var data: Payload;
 
-	try {
-		if (this.encoding === "etf" && buffer instanceof Buffer) data = erlpack.unpack(buffer);
-		else if (this.encoding === "json" && typeof buffer === "string") data = JSON.parse(buffer);
-		const result = instanceOf(PayloadSchema, data);
-		if (result !== true) throw "invalid data";
-	} catch (error) {
-		return this.close(CLOSECODES.Decode_error);
-	}
+	if (this.encoding === "etf" && buffer instanceof Buffer) data = erlpack.unpack(buffer);
+	else if (this.encoding === "json" && typeof buffer === "string") data = JSON.parse(buffer);
+
+	check.call(this, PayloadSchema, data);
+
+	console.log(data);
 
 	// @ts-ignore
 	const OPCodeHandler = OPCodeHandlers[data.op];
diff --git a/src/opcodes/Heartbeat.ts b/src/opcodes/Heartbeat.ts
index 4c8df739..015257b9 100644
--- a/src/opcodes/Heartbeat.ts
+++ b/src/opcodes/Heartbeat.ts
@@ -3,10 +3,10 @@ import { Send } from "../util/Send";
 import { setHeartbeat } from "../util/setHeartbeat";
 import WebSocket from "../util/WebSocket";
 
-export function onHeartbeat(this: WebSocket, data: Payload) {
+export async function onHeartbeat(this: WebSocket, data: Payload) {
 	// TODO: validate payload
 
 	setHeartbeat(this);
 
-	Send(this, { op: 11 });
+	await Send(this, { op: 11 });
 }
diff --git a/src/opcodes/Resume.ts b/src/opcodes/Resume.ts
index 8badbb35..3c54b5c7 100644
--- a/src/opcodes/Resume.ts
+++ b/src/opcodes/Resume.ts
@@ -3,5 +3,5 @@ import { CLOSECODES, Payload } from "../util/Constants";
 import WebSocket from "../util/WebSocket";
 
 export function onResume(this: WebSocket, data: Payload) {
-	return this.close(CLOSECODES.Session_timed_out);
+	return this.close(CLOSECODES.Invalid_session);
 }
diff --git a/src/opcodes/instanceOf.ts b/src/opcodes/instanceOf.ts
index 752ea2b6..4a34477f 100644
--- a/src/opcodes/instanceOf.ts
+++ b/src/opcodes/instanceOf.ts
@@ -6,6 +6,7 @@ export function check(this: WebSocket, schema: any, data: any) {
 	try {
 		if (instanceOf(schema, data) !== true) throw "invalid";
 	} catch (error) {
+		console.error(error);
 		// invalid payload
 		this.close(CLOSECODES.Decode_error);
 		return false;