diff --git a/src/gateway/events/Close.ts b/src/gateway/events/Close.ts
index 5b7c512c..34831eab 100644
--- a/src/gateway/events/Close.ts
+++ b/src/gateway/events/Close.ts
@@ -1,12 +1,5 @@
import { WebSocket } from "@fosscord/gateway";
-import {
- emitEvent,
- PresenceUpdateEvent,
- PrivateSessionProjection,
- Session,
- SessionsReplace,
- User,
-} from "@fosscord/util";
+import { emitEvent, PresenceUpdateEvent, PrivateSessionProjection, Session, SessionsReplace, User } from "@fosscord/util";
export async function Close(this: WebSocket, code: number, reason: string) {
console.log("[WebSocket] closed", code, reason);
@@ -19,17 +12,17 @@ export async function Close(this: WebSocket, code: number, reason: string) {
await Session.delete({ session_id: this.session_id });
const sessions = await Session.find({
where: { user_id: this.user_id },
- select: PrivateSessionProjection,
+ select: PrivateSessionProjection
});
await emitEvent({
event: "SESSIONS_REPLACE",
user_id: this.user_id,
- data: sessions,
+ data: sessions
} as SessionsReplace);
const session = sessions.first() || {
activities: [],
client_info: {},
- status: "offline",
+ status: "offline"
};
await emitEvent({
@@ -39,8 +32,8 @@ export async function Close(this: WebSocket, code: number, reason: string) {
user: await User.getPublicUser(this.user_id),
activities: session.activities,
client_status: session?.client_info,
- status: session.status,
- },
+ status: session.status
+ }
} as PresenceUpdateEvent);
}
}
diff --git a/src/gateway/events/Connection.ts b/src/gateway/events/Connection.ts
index 508b4741..5a5ce48f 100644
--- a/src/gateway/events/Connection.ts
+++ b/src/gateway/events/Connection.ts
@@ -1,13 +1,13 @@
-import WS from "ws";
import { WebSocket } from "@fosscord/gateway";
-import { Send } from "../util/Send";
+import { IncomingMessage } from "http";
+import { URL } from "url";
+import WS from "ws";
+import { createDeflate } from "zlib";
import { CLOSECODES, OPCODES } from "../util/Constants";
import { setHeartbeat } from "../util/Heartbeat";
-import { IncomingMessage } from "http";
+import { Send } from "../util/Send";
import { Close } from "./Close";
import { Message } from "./Message";
-import { createDeflate } from "zlib";
-import { URL } from "url";
let erlpack: any;
try {
erlpack = require("@yukikaze-bot/erlpack");
@@ -17,30 +17,26 @@ try {
// TODO: specify rate limit in config
// TODO: check msg max size
-export async function Connection(
- this: WS.Server,
- socket: WebSocket,
- request: IncomingMessage
-) {
+export async function Connection(this: WS.Server, socket: WebSocket, request: IncomingMessage) {
try {
// @ts-ignore
socket.on("close", Close);
// @ts-ignore
socket.on("message", Message);
-
- if(process.env.WS_LOGEVENTS)
- [
- "close",
- "error",
- "upgrade",
- //"message",
- "open",
- "ping",
- "pong",
- "unexpected-response"
- ].forEach(x=>{
- socket.on(x, y => console.log(x, y));
- });
+
+ if (process.env.WS_LOGEVENTS)
+ [
+ "close",
+ "error",
+ "upgrade",
+ //"message",
+ "open",
+ "ping",
+ "pong",
+ "unexpected-response"
+ ].forEach((x) => {
+ socket.on(x, (y) => console.log(x, y));
+ });
console.log(`[Gateway] Connections: ${this.clients.size}`);
@@ -49,23 +45,19 @@ export async function Connection(
socket.encoding = searchParams.get("encoding") || "json";
if (!["json", "etf"].includes(socket.encoding)) {
if (socket.encoding === "etf" && erlpack) {
- throw new Error(
- "Erlpack is not installed: 'npm i @yukikaze-bot/erlpack'"
- );
+ throw new Error("Erlpack is not installed: 'npm i @yukikaze-bot/erlpack'");
}
return socket.close(CLOSECODES.Decode_error);
}
// @ts-ignore
socket.version = Number(searchParams.get("version")) || 8;
- if (socket.version != 8)
- return socket.close(CLOSECODES.Invalid_API_version);
+ if (socket.version != 8) return socket.close(CLOSECODES.Invalid_API_version);
// @ts-ignore
socket.compress = searchParams.get("compress") || "";
if (socket.compress) {
- if (socket.compress !== "zlib-stream")
- return socket.close(CLOSECODES.Decode_error);
+ if (socket.compress !== "zlib-stream") return socket.close(CLOSECODES.Decode_error);
socket.deflate = createDeflate({ chunkSize: 65535 });
socket.deflate.on("data", (chunk) => socket.send(chunk));
}
@@ -80,8 +72,8 @@ export async function Connection(
await Send(socket, {
op: OPCODES.Hello,
d: {
- heartbeat_interval: 1000 * 30,
- },
+ heartbeat_interval: 1000 * 30
+ }
});
socket.readyTimeout = setTimeout(() => {
diff --git a/src/gateway/events/Message.ts b/src/gateway/events/Message.ts
index 569f5fc7..96950a42 100644
--- a/src/gateway/events/Message.ts
+++ b/src/gateway/events/Message.ts
@@ -1,42 +1,39 @@
+import { Payload, WebSocket } from "@fosscord/gateway";
+import OPCodeHandlers from "../opcodes";
+import { check } from "../opcodes/instanceOf";
import { CLOSECODES } from "../util/Constants";
-import { WebSocket, Payload } from "@fosscord/gateway";
let erlpack: any;
try {
erlpack = require("@yukikaze-bot/erlpack");
} catch (error) {}
-import OPCodeHandlers from "../opcodes";
-import { check } from "../opcodes/instanceOf";
const PayloadSchema = {
op: Number,
$d: Object || Number, // or number for heartbeat sequence
$s: Number,
- $t: String,
+ $t: String
};
export async function Message(this: WebSocket, buffer: Buffer) {
// TODO: compression
let data: Payload;
- if (this.encoding === "etf" && buffer instanceof Buffer)
- data = erlpack.unpack(buffer);
+ if (this.encoding === "etf" && buffer instanceof Buffer) data = erlpack.unpack(buffer);
else if (this.encoding === "json")
data = JSON.parse(buffer as unknown as string); //TODO: is this even correct?? seems to work for web clients...
- else if(/--debug|--inspect/.test(process.execArgv.join(' '))) {
+ else if (/--debug|--inspect/.test(process.execArgv.join(" "))) {
debugger;
return;
- }
- else {
+ } else {
console.log("Invalid gateway connection! Use a debugger to inspect!");
return;
}
- if(process.env.WS_VERBOSE)
- console.log(`[Websocket] Incomming message: ${JSON.stringify(data)}`);
- if(data.op !== 1)
- check.call(this, PayloadSchema, data);
- else { //custom validation for numbers, because heartbeat
- if(data.s || data.t || (typeof data.d !== "number" && data.d)) {
+ if (process.env.WS_VERBOSE) console.log(`[Websocket] Incomming message: ${JSON.stringify(data)}`);
+ if (data.op !== 1) check.call(this, PayloadSchema, data);
+ else {
+ //custom validation for numbers, because heartbeat
+ if (data.s || data.t || (typeof data.d !== "number" && data.d)) {
console.log("Invalid heartbeat...");
this.close(CLOSECODES.Decode_error);
}
@@ -55,7 +52,6 @@ export async function Message(this: WebSocket, buffer: Buffer) {
return await OPCodeHandler.call(this, data);
} catch (error) {
console.error(error);
- if (!this.CLOSED && this.CLOSING)
- return this.close(CLOSECODES.Unknown_error);
+ if (!this.CLOSED && this.CLOSING) return this.close(CLOSECODES.Unknown_error);
}
}
|
