diff --git a/gateway/src/events/Close.ts b/gateway/src/events/Close.ts
index 2f274ec4..4afe8352 100644
--- a/gateway/src/events/Close.ts
+++ b/gateway/src/events/Close.ts
@@ -1,4 +1,4 @@
-import WebSocket from "../util/WebSocket";
+import WebSocket from "@fosscord/gateway/util/WebSocket";
import { Message } from "./Message";
import { Session } from "@fosscord/util";
diff --git a/gateway/src/events/Connection.ts b/gateway/src/events/Connection.ts
index b3c94eaf..b9d2d6a1 100644
--- a/gateway/src/events/Connection.ts
+++ b/gateway/src/events/Connection.ts
@@ -1,10 +1,11 @@
-import WebSocket, { Server } from "../util/WebSocket";
+import WS from "ws";
+import WebSocket from "@fosscord/gateway/util/WebSocket";
import { IncomingMessage } from "http";
import { Close } from "./Close";
import { Message } from "./Message";
-import { setHeartbeat } from "../util/setHeartbeat";
-import { Send } from "../util/Send";
-import { CLOSECODES, OPCODES } from "../util/Constants";
+import { setHeartbeat } from "@fosscord/gateway/util/setHeartbeat";
+import { Send } from "@fosscord/gateway/util/Send";
+import { CLOSECODES, OPCODES } from "@fosscord/gateway/util/Constants";
import { createDeflate } from "zlib";
import { URL } from "url";
import { Session } from "@fosscord/util";
@@ -17,7 +18,11 @@ try {
// TODO: specify rate limit in config
// TODO: check msg max size
-export async function Connection(this: Server, socket: WebSocket, request: IncomingMessage) {
+export async function Connection(
+ this: WS.Server,
+ socket: WebSocket,
+ request: IncomingMessage
+) {
try {
socket.on("close", Close);
// @ts-ignore
@@ -27,18 +32,21 @@ export async function Connection(this: Server, socket: WebSocket, request: Incom
// @ts-ignore
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 -D erlpack'");
+ if (socket.encoding === "etf" && erlpack)
+ throw new Error("Erlpack is not installed: 'npm i -D 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));
}
diff --git a/gateway/src/events/Message.ts b/gateway/src/events/Message.ts
index a8bf5d78..66f98f1c 100644
--- a/gateway/src/events/Message.ts
+++ b/gateway/src/events/Message.ts
@@ -1,10 +1,10 @@
-import WebSocket, { Data } from "../util/WebSocket";
+import WebSocket from "@fosscord/gateway/util/WebSocket";
var erlpack: any;
try {
erlpack = require("erlpack");
} catch (error) {}
import OPCodeHandlers from "../opcodes";
-import { Payload, CLOSECODES, OPCODES } from "../util/Constants";
+import { Payload, CLOSECODES, OPCODES } from "@fosscord/gateway/util/Constants";
import { instanceOf, Tuple } from "lambert-server";
import { check } from "../opcodes/instanceOf";
import WS from "ws";
@@ -20,8 +20,10 @@ export async function Message(this: WebSocket, buffer: WS.Data) {
// TODO: compression
var data: Payload;
- if (this.encoding === "etf" && buffer instanceof Buffer) data = erlpack.unpack(buffer);
- else if (this.encoding === "json" && typeof buffer === "string") data = JSON.parse(buffer);
+ if (this.encoding === "etf" && buffer instanceof Buffer)
+ data = erlpack.unpack(buffer);
+ else if (this.encoding === "json" && typeof buffer === "string")
+ data = JSON.parse(buffer);
else return;
check.call(this, PayloadSchema, data);
@@ -41,6 +43,7 @@ export async function Message(this: WebSocket, buffer: WS.Data) {
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);
}
}
diff --git a/gateway/src/index.ts b/gateway/src/index.ts
index 7513bd2f..d77ce931 100644
--- a/gateway/src/index.ts
+++ b/gateway/src/index.ts
@@ -1 +1,4 @@
export * from "./Server";
+export * from "./util/";
+export * from "./opcodes/";
+export * from "./listener/listener";
diff --git a/gateway/src/listener/listener.ts b/gateway/src/listener/listener.ts
index 0b6fa50c..e5630a43 100644
--- a/gateway/src/listener/listener.ts
+++ b/gateway/src/listener/listener.ts
@@ -9,13 +9,13 @@ import {
ListenEventOpts,
Member,
} from "@fosscord/util";
-import { OPCODES } from "../util/Constants";
-import { Send } from "../util/Send";
-import WebSocket from "../util/WebSocket";
+import { OPCODES } from "@fosscord/gateway/util/Constants";
+import { Send } from "@fosscord/gateway/util/Send";
+import WebSocket from "@fosscord/gateway/util/WebSocket";
import "missing-native-js-functions";
import { Channel as AMQChannel } from "amqplib";
-import { In, Like } from "../../../util/node_modules/typeorm";
-import { Recipient } from "../../../util/dist/entities/Recipient";
+import { In, Like } from "typeorm";
+import { Recipient } from "@fosscord/util";
// TODO: close connection on Invalidated Token
// TODO: check intent
diff --git a/gateway/src/opcodes/Heartbeat.ts b/gateway/src/opcodes/Heartbeat.ts
index 015257b9..34d8ca74 100644
--- a/gateway/src/opcodes/Heartbeat.ts
+++ b/gateway/src/opcodes/Heartbeat.ts
@@ -1,7 +1,7 @@
-import { CLOSECODES, Payload } from "../util/Constants";
-import { Send } from "../util/Send";
-import { setHeartbeat } from "../util/setHeartbeat";
-import WebSocket from "../util/WebSocket";
+import { CLOSECODES, Payload } from "@fosscord/gateway/util/Constants";
+import { Send } from "@fosscord/gateway/util/Send";
+import { setHeartbeat } from "@fosscord/gateway/util/setHeartbeat";
+import WebSocket from "@fosscord/gateway/util/WebSocket";
export async function onHeartbeat(this: WebSocket, data: Payload) {
// TODO: validate payload
diff --git a/gateway/src/opcodes/Identify.ts b/gateway/src/opcodes/Identify.ts
index 95db7f3d..04a6c84c 100644
--- a/gateway/src/opcodes/Identify.ts
+++ b/gateway/src/opcodes/Identify.ts
@@ -1,5 +1,5 @@
-import { CLOSECODES, Payload, OPCODES } from "../util/Constants";
-import WebSocket from "../util/WebSocket";
+import { CLOSECODES, Payload, OPCODES } from "@fosscord/gateway/util/Constants";
+import WebSocket from "@fosscord/gateway/util/WebSocket";
import {
Channel,
checkToken,
@@ -17,12 +17,12 @@ import {
} from "@fosscord/util";
import { setupListener } from "../listener/listener";
import { IdentifySchema } from "../schema/Identify";
-import { Send } from "../util/Send";
+import { Send } from "@fosscord/gateway/util/Send";
// import experiments from "./experiments.json";
const experiments: any = [];
import { check } from "./instanceOf";
-import { Recipient } from "../../../util/dist/entities/Recipient";
-import { genSessionId } from "../util/SessionUtils";
+import { Recipient } from "@fosscord/util";
+import { genSessionId } from "@fosscord/gateway/util/SessionUtils";
// TODO: bot sharding
// TODO: check priviliged intents
diff --git a/gateway/src/opcodes/LazyRequest.ts b/gateway/src/opcodes/LazyRequest.ts
index b7ee9a96..41ec3446 100644
--- a/gateway/src/opcodes/LazyRequest.ts
+++ b/gateway/src/opcodes/LazyRequest.ts
@@ -6,9 +6,9 @@ import {
Role,
} from "@fosscord/util";
import { LazyRequest } from "../schema/LazyRequest";
-import { OPCODES, Payload } from "../util/Constants";
-import { Send } from "../util/Send";
-import WebSocket from "../util/WebSocket";
+import { OPCODES, Payload } from "@fosscord/gateway/util/Constants";
+import { Send } from "@fosscord/gateway/util/Send";
+import WebSocket from "@fosscord/gateway/util/WebSocket";
import { check } from "./instanceOf";
import "missing-native-js-functions";
diff --git a/gateway/src/opcodes/PresenceUpdate.ts b/gateway/src/opcodes/PresenceUpdate.ts
index 3760f8a3..4febbfcb 100644
--- a/gateway/src/opcodes/PresenceUpdate.ts
+++ b/gateway/src/opcodes/PresenceUpdate.ts
@@ -1,5 +1,5 @@
-import { CLOSECODES, Payload } from "../util/Constants";
-import WebSocket from "../util/WebSocket";
+import { CLOSECODES, Payload } from "@fosscord/gateway/util/Constants";
+import WebSocket from "@fosscord/gateway/util/WebSocket";
export function onPresenceUpdate(this: WebSocket, data: Payload) {
// return this.close(CLOSECODES.Unknown_error);
diff --git a/gateway/src/opcodes/RequestGuildMembers.ts b/gateway/src/opcodes/RequestGuildMembers.ts
index 2701d978..9c1654fa 100644
--- a/gateway/src/opcodes/RequestGuildMembers.ts
+++ b/gateway/src/opcodes/RequestGuildMembers.ts
@@ -1,6 +1,6 @@
-import { CLOSECODES, Payload } from "../util/Constants";
+import { CLOSECODES, Payload } from "@fosscord/gateway/util/Constants";
-import WebSocket from "../util/WebSocket";
+import WebSocket from "@fosscord/gateway/util/WebSocket";
export function onRequestGuildMembers(this: WebSocket, data: Payload) {
// return this.close(CLOSECODES.Unknown_error);
diff --git a/gateway/src/opcodes/Resume.ts b/gateway/src/opcodes/Resume.ts
index 4efde9b0..e155c139 100644
--- a/gateway/src/opcodes/Resume.ts
+++ b/gateway/src/opcodes/Resume.ts
@@ -1,7 +1,7 @@
-import { CLOSECODES, Payload } from "../util/Constants";
-import { Send } from "../util/Send";
+import { CLOSECODES, Payload } from "@fosscord/gateway/util/Constants";
+import { Send } from "@fosscord/gateway/util/Send";
-import WebSocket from "../util/WebSocket";
+import WebSocket from "@fosscord/gateway/util/WebSocket";
export async function onResume(this: WebSocket, data: Payload) {
console.log("Got Resume -> cancel not implemented");
diff --git a/gateway/src/opcodes/VoiceStateUpdate.ts b/gateway/src/opcodes/VoiceStateUpdate.ts
index 95a01608..60803ec3 100644
--- a/gateway/src/opcodes/VoiceStateUpdate.ts
+++ b/gateway/src/opcodes/VoiceStateUpdate.ts
@@ -1,9 +1,18 @@
import { VoiceStateUpdateSchema } from "../schema/VoiceStateUpdateSchema";
-import { Payload } from "../util/Constants";
-import WebSocket from "../util/WebSocket";
+import { Payload } from "@fosscord/gateway/util/Constants";
+import WebSocket from "@fosscord/gateway/util/WebSocket";
import { check } from "./instanceOf";
-import { Config, emitEvent, Guild, Member, Region, VoiceServerUpdateEvent, VoiceState, VoiceStateUpdateEvent } from "@fosscord/util";
-import { genVoiceToken } from "../util/SessionUtils";
+import {
+ Config,
+ emitEvent,
+ Guild,
+ Member,
+ Region,
+ VoiceServerUpdateEvent,
+ VoiceState,
+ VoiceStateUpdateEvent,
+} from "@fosscord/util";
+import { genVoiceToken } from "@fosscord/gateway/util/SessionUtils";
// TODO: check if a voice server is setup
// Notice: Bot users respect the voice channel's user limit, if set. When the voice channel is full, you will not receive the Voice State Update or Voice Server Update events in response to your own Voice State Update. Having MANAGE_CHANNELS permission bypasses this limit and allows you to join regardless of the channel being full or not.
@@ -14,21 +23,27 @@ export async function onVoiceStateUpdate(this: WebSocket, data: Payload) {
let voiceState: VoiceState;
try {
voiceState = await VoiceState.findOneOrFail({
- where: { user_id: this.user_id }
+ where: { user_id: this.user_id },
});
- if (voiceState.session_id !== this.session_id && body.channel_id === null) {
+ if (
+ voiceState.session_id !== this.session_id &&
+ body.channel_id === null
+ ) {
//Should we also check guild_id === null?
//changing deaf or mute on a client that's not the one with the same session of the voicestate in the database should be ignored
return;
}
//If a user change voice channel between guild we should send a left event first
- if (voiceState.guild_id !== body.guild_id && voiceState.session_id === this.session_id) {
+ if (
+ voiceState.guild_id !== body.guild_id &&
+ voiceState.session_id === this.session_id
+ ) {
await emitEvent({
event: "VOICE_STATE_UPDATE",
data: { ...voiceState, channel_id: null },
guild_id: voiceState.guild_id,
- })
+ });
}
//The event send by Discord's client on channel leave has both guild_id and channel_id as null
@@ -50,10 +65,11 @@ export async function onVoiceStateUpdate(this: WebSocket, data: Payload) {
voiceState.member = await Member.findOneOrFail({
where: { id: voiceState.user_id, guild_id: voiceState.guild_id },
relations: ["user", "roles"],
- })
+ });
//If the session changed we generate a new token
- if (voiceState.session_id !== this.session_id) voiceState.token = genVoiceToken();
+ if (voiceState.session_id !== this.session_id)
+ voiceState.token = genVoiceToken();
voiceState.session_id = this.session_id;
const { id, ...newObj } = voiceState;
@@ -69,13 +85,17 @@ export async function onVoiceStateUpdate(this: WebSocket, data: Payload) {
//If it's null it means that we are leaving the channel and this event is not needed
if (voiceState.channel_id !== null) {
- const guild = await Guild.findOne({ id: voiceState.guild_id })
+ const guild = await Guild.findOne({ id: voiceState.guild_id });
const regions = Config.get().regions;
let guildRegion: Region;
if (guild && guild.region) {
- guildRegion = regions.available.filter(r => (r.id === guild.region))[0]
+ guildRegion = regions.available.filter(
+ (r) => r.id === guild.region
+ )[0];
} else {
- guildRegion = regions.available.filter(r => (r.id === regions.default))[0]
+ guildRegion = regions.available.filter(
+ (r) => r.id === regions.default
+ )[0];
}
await emitEvent({
diff --git a/gateway/src/opcodes/index.ts b/gateway/src/opcodes/index.ts
index fa57f568..a6d13bfb 100644
--- a/gateway/src/opcodes/index.ts
+++ b/gateway/src/opcodes/index.ts
@@ -1,5 +1,5 @@
-import { Payload } from "../util/Constants";
-import WebSocket from "../util/WebSocket";
+import { Payload } from "@fosscord/gateway/util/Constants";
+import WebSocket from "@fosscord/gateway/util/WebSocket";
import { onHeartbeat } from "./Heartbeat";
import { onIdentify } from "./Identify";
import { onLazyRequest } from "./LazyRequest";
diff --git a/gateway/src/opcodes/instanceOf.ts b/gateway/src/opcodes/instanceOf.ts
index c4ee5ee6..6d84ac21 100644
--- a/gateway/src/opcodes/instanceOf.ts
+++ b/gateway/src/opcodes/instanceOf.ts
@@ -1,6 +1,6 @@
import { instanceOf } from "lambert-server";
-import { CLOSECODES } from "../util/Constants";
-import WebSocket from "../util/WebSocket";
+import { CLOSECODES } from "@fosscord/gateway/util/Constants";
+import WebSocket from "@fosscord/gateway/util/WebSocket";
export function check(this: WebSocket, schema: any, data: any) {
try {
diff --git a/gateway/src/util/Send.ts b/gateway/src/util/Send.ts
index be25ac4f..1b00e361 100644
--- a/gateway/src/util/Send.ts
+++ b/gateway/src/util/Send.ts
@@ -2,7 +2,7 @@ var erlpack: any;
try {
erlpack = require("erlpack");
} catch (error) {}
-import { Payload } from "../util/Constants";
+import { Payload } from "@fosscord/gateway/util/Constants";
import WebSocket from "./WebSocket";
diff --git a/gateway/src/util/WebSocket.ts b/gateway/src/util/WebSocket.ts
index 2c763743..15d1549f 100644
--- a/gateway/src/util/WebSocket.ts
+++ b/gateway/src/util/WebSocket.ts
@@ -1,5 +1,5 @@
import { Intents, Permissions } from "@fosscord/util";
-import WS, { Server, Data } from "ws";
+import WS from "ws";
import { Deflate } from "zlib";
import { Channel } from "amqplib";
@@ -21,4 +21,3 @@ interface WebSocket extends WS {
}
export default WebSocket;
-export { Server, Data };
diff --git a/gateway/src/util/index.ts b/gateway/src/util/index.ts
new file mode 100644
index 00000000..27af5813
--- /dev/null
+++ b/gateway/src/util/index.ts
@@ -0,0 +1,5 @@
+export * from "./Constants";
+export * from "./Send";
+export * from "./SessionUtils";
+export * from "./setHeartbeat";
+export * from "./WebSocket";
|
