diff --git a/gateway/src/events/Message.ts b/gateway/src/events/Message.ts
deleted file mode 100644
index acc39bb9..00000000
--- a/gateway/src/events/Message.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { CLOSECODES, OPCODES } from "../util/Constants";
-import { WebSocket, Payload } from "@fosscord/gateway";
-var erlpack: any;
-try {
- erlpack = require("@yukikaze-bot/erlpack");
-} catch (error) {}
-import OPCodeHandlers from "../opcodes";
-import { Tuple } from "lambert-server";
-import { check } from "../opcodes/instanceOf";
-import WS from "ws";
-
-const PayloadSchema = {
- op: Number,
- $d: new Tuple(Object, Number), // or number for heartbeat sequence
- $s: Number,
- $t: String,
-};
-
-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);
- else return;
-
- check.call(this, PayloadSchema, data);
-
- // @ts-ignore
- const OPCodeHandler = OPCodeHandlers[data.op];
- if (!OPCodeHandler) {
- console.error("[Gateway] Unkown opcode " + data.op);
- // TODO: if all opcodes are implemented comment this out:
- // this.close(CLOSECODES.Unknown_opcode);
- return;
- }
-
- try {
- return await OPCodeHandler.call(this, data);
- } catch (error) {
- console.error(error);
- if (!this.CLOSED && this.CLOSING)
- return this.close(CLOSECODES.Unknown_error);
- }
-}
diff --git a/gateway/src/schema/VoiceStateUpdateSchema.ts b/gateway/src/schema/VoiceStateUpdateSchema.ts
deleted file mode 100644
index 9efa191e..00000000
--- a/gateway/src/schema/VoiceStateUpdateSchema.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export const VoiceStateUpdateSchema = {
- $guild_id: String,
- $channel_id: String,
- self_mute: Boolean,
- self_deaf: Boolean,
- self_video: Boolean,
-};
-
-export interface VoiceStateUpdateSchema {
- guild_id?: string;
- channel_id?: string;
- self_mute: boolean;
- self_deaf: boolean;
- self_video: boolean;
-}
diff --git a/gateway/src/Server.ts b/src/gateway/Server.ts
index 7e1489be..97da3fa0 100644
--- a/gateway/src/Server.ts
+++ b/src/gateway/Server.ts
@@ -1,10 +1,9 @@
-import "missing-native-js-functions";
+import { closeDatabase, Config, getOrInitialiseDatabase, initEvent } from "@fosscord/util";
import dotenv from "dotenv";
-dotenv.config();
-import { closeDatabase, Config, initDatabase, initEvent } from "@fosscord/util";
+import http from "http";
import ws from "ws";
import { Connection } from "./events/Connection";
-import http from "http";
+dotenv.config();
export class Server {
public ws: ws.Server;
@@ -12,15 +11,7 @@ export class Server {
public server: http.Server;
public production: boolean;
- constructor({
- port,
- server,
- production,
- }: {
- port: number;
- server?: http.Server;
- production?: boolean;
- }) {
+ constructor({ port, server, production }: { port: number; server?: http.Server; production?: boolean }) {
this.port = port;
this.production = production || false;
@@ -40,14 +31,14 @@ export class Server {
this.ws = new ws.Server({
maxPayload: 4096,
- noServer: true,
+ noServer: true
});
this.ws.on("connection", Connection);
this.ws.on("error", console.error);
}
async start(): Promise<void> {
- await initDatabase();
+ await getOrInitialiseDatabase();
await Config.init();
await initEvent();
if (!this.server.listening) {
diff --git a/gateway/src/events/Close.ts b/src/gateway/events/Close.ts
index 5b7c512c..34831eab 100644
--- a/gateway/src/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/gateway/src/events/Connection.ts b/src/gateway/events/Connection.ts
index 4954cd08..5a5ce48f 100644
--- a/gateway/src/events/Connection.ts
+++ b/src/gateway/events/Connection.ts
@@ -1,14 +1,14 @@
-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";
-var erlpack: any;
+let erlpack: any;
try {
erlpack = require("@yukikaze-bot/erlpack");
} catch (error) {}
@@ -17,16 +17,27 @@ 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));
+ });
+
console.log(`[Gateway] Connections: ${this.clients.size}`);
const { searchParams } = new URL(`http://localhost${request.url}`);
@@ -34,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));
}
@@ -65,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/gateway/src/index.ts b/src/gateway/index.ts
index d77ce931..730347f9 100644
--- a/gateway/src/index.ts
+++ b/src/gateway/index.ts
@@ -1,4 +1,4 @@
+export * from "./listener/listener";
+export * from "./opcodes/";
export * from "./Server";
export * from "./util/";
-export * from "./opcodes/";
-export * from "./listener/listener";
diff --git a/gateway/src/listener/listener.ts b/src/gateway/listener/listener.ts
index 060de65b..811318af 100644
--- a/gateway/src/listener/listener.ts
+++ b/src/gateway/listener/listener.ts
@@ -1,21 +1,20 @@
+import { WebSocket } from "@fosscord/gateway";
import {
+ EVENTEnum,
+ EventOpts,
getPermission,
- Permissions,
- RabbitMQ,
listenEvent,
- EventOpts,
ListenEventOpts,
Member,
- EVENTEnum,
+ Permissions,
+ RabbitMQ,
+ Recipient,
Relationship,
- RelationshipType,
+ RelationshipType
} from "@fosscord/util";
+import { Channel as AMQChannel } from "amqplib";
import { OPCODES } from "../util/Constants";
import { Send } from "../util/Send";
-import { WebSocket } from "@fosscord/gateway";
-import "missing-native-js-functions";
-import { Channel as AMQChannel } from "amqplib";
-import { Recipient } from "@fosscord/util";
// TODO: close connection on Invalidated Token
// TODO: check intent
@@ -24,17 +23,14 @@ import { Recipient } from "@fosscord/util";
// Sharding: calculate if the current shard id matches the formula: shard_id = (guild_id >> 22) % num_shards
// https://discord.com/developers/docs/topics/gateway#sharding
-export function handlePresenceUpdate(
- this: WebSocket,
- { event, acknowledge, data }: EventOpts
-) {
+export function handlePresenceUpdate(this: WebSocket, { event, acknowledge, data }: EventOpts) {
acknowledge?.();
if (event === EVENTEnum.PresenceUpdate) {
return Send(this, {
op: OPCODES.Dispatch,
t: event,
d: data,
- s: this.sequence++,
+ s: this.sequence++
});
}
}
@@ -44,23 +40,25 @@ export async function setupListener(this: WebSocket) {
const [members, recipients, relationships] = await Promise.all([
Member.find({
where: { id: this.user_id },
- relations: ["guild", "guild.channels"],
+ relations: ["guild", "guild.channels"]
}),
Recipient.find({
where: { user_id: this.user_id, closed: false },
- relations: ["channel"],
+ relations: ["channel"]
}),
Relationship.find({
- from_id: this.user_id,
- type: RelationshipType.friends,
- }),
+ where: {
+ from_id: this.user_id,
+ type: RelationshipType.friends
+ }
+ })
]);
const guilds = members.map((x) => x.guild);
const dm_channels = recipients.map((x) => x.channel);
const opts: { acknowledge: boolean; channel?: AMQChannel } = {
- acknowledge: true,
+ acknowledge: true
};
this.listen_options = opts;
const consumer = consume.bind(this);
@@ -74,11 +72,7 @@ export async function setupListener(this: WebSocket) {
this.events[this.user_id] = await listenEvent(this.user_id, consumer, opts);
relationships.forEach(async (relationship) => {
- this.events[relationship.to_id] = await listenEvent(
- relationship.to_id,
- handlePresenceUpdate.bind(this),
- opts
- );
+ this.events[relationship.to_id] = await listenEvent(relationship.to_id, handlePresenceUpdate.bind(this), opts);
});
dm_channels.forEach(async (channel) => {
@@ -91,16 +85,8 @@ export async function setupListener(this: WebSocket) {
this.events[guild.id] = await listenEvent(guild.id, consumer, opts);
guild.channels.forEach(async (channel) => {
- if (
- permission
- .overwriteChannel(channel.permission_overwrites!)
- .has("VIEW_CHANNEL")
- ) {
- this.events[channel.id] = await listenEvent(
- channel.id,
- consumer,
- opts
- );
+ if (permission.overwriteChannel(channel.permission_overwrites!).has("VIEW_CHANNEL")) {
+ this.events[channel.id] = await listenEvent(channel.id, consumer, opts);
}
});
});
@@ -132,11 +118,7 @@ async function consume(this: WebSocket, opts: EventOpts) {
delete this.member_events[data.user.id];
case "GUILD_MEMBER_ADD":
if (this.member_events[data.user.id]) break; // already subscribed
- this.member_events[data.user.id] = await listenEvent(
- data.user.id,
- handlePresenceUpdate.bind(this),
- this.listen_options
- );
+ this.member_events[data.user.id] = await listenEvent(data.user.id, handlePresenceUpdate.bind(this), this.listen_options);
break;
case "GUILD_MEMBER_REMOVE":
if (!this.member_events[data.user.id]) break;
@@ -149,21 +131,13 @@ async function consume(this: WebSocket, opts: EventOpts) {
opts.cancel();
break;
case "CHANNEL_CREATE":
- if (
- !permission
- .overwriteChannel(data.permission_overwrites)
- .has("VIEW_CHANNEL")
- ) {
+ if (!permission.overwriteChannel(data.permission_overwrites).has("VIEW_CHANNEL")) {
return;
}
this.events[id] = await listenEvent(id, consumer, listenOpts);
break;
case "RELATIONSHIP_ADD":
- this.events[data.user.id] = await listenEvent(
- data.user.id,
- handlePresenceUpdate.bind(this),
- this.listen_options
- );
+ this.events[data.user.id] = await listenEvent(data.user.id, handlePresenceUpdate.bind(this), this.listen_options);
break;
case "GUILD_CREATE":
this.events[id] = await listenEvent(id, consumer, listenOpts);
@@ -171,11 +145,7 @@ async function consume(this: WebSocket, opts: EventOpts) {
case "CHANNEL_UPDATE":
const exists = this.events[id];
// @ts-ignore
- if (
- permission
- .overwriteChannel(data.permission_overwrites)
- .has("VIEW_CHANNEL")
- ) {
+ if (permission.overwriteChannel(data.permission_overwrites).has("VIEW_CHANNEL")) {
if (exists) break;
this.events[id] = await listenEvent(id, consumer, listenOpts);
} else {
@@ -245,6 +215,6 @@ async function consume(this: WebSocket, opts: EventOpts) {
op: OPCODES.Dispatch,
t: event,
d: data,
- s: this.sequence++,
+ s: this.sequence++
});
}
diff --git a/gateway/src/opcodes/Heartbeat.ts b/src/gateway/opcodes/Heartbeat.ts
index 50394130..42b72d4b 100644
--- a/gateway/src/opcodes/Heartbeat.ts
+++ b/src/gateway/opcodes/Heartbeat.ts
@@ -2,7 +2,7 @@ import { Payload, WebSocket } from "@fosscord/gateway";
import { setHeartbeat } from "../util/Heartbeat";
import { Send } from "../util/Send";
-export async function onHeartbeat(this: WebSocket, data: Payload) {
+export async function onHeartbeat(this: WebSocket, _data: Payload) {
// TODO: validate payload
setHeartbeat(this);
diff --git a/gateway/src/opcodes/Identify.ts b/src/gateway/opcodes/Identify.ts
index 860000da..ac6955fd 100644
--- a/gateway/src/opcodes/Identify.ts
+++ b/src/gateway/opcodes/Identify.ts
@@ -1,33 +1,35 @@
-import { WebSocket, Payload } from "@fosscord/gateway";
+import { Payload, WebSocket } from "@fosscord/gateway";
import {
+ Application,
checkToken,
+ Config,
+ emitEvent,
+ EVENTEnum,
+ IdentifySchema,
Intents,
Member,
- ReadyEventData,
- User,
- Session,
- EVENTEnum,
- Config,
+ MemberPrivateProjection,
+ OrmUtils,
+ PresenceUpdateEvent,
+ PrivateSessionProjection,
+ PrivateUserProjection,
PublicMember,
PublicUser,
- PrivateUserProjection,
ReadState,
- Application,
- emitEvent,
+ ReadyEventData,
+ Recipient,
+ Session,
SessionsReplace,
- PrivateSessionProjection,
- MemberPrivateProjection,
- PresenceUpdateEvent,
+ User,
+ UserSettings
} from "@fosscord/util";
-import { Send } from "../util/Send";
+import { setupListener } from "../listener/listener";
import { CLOSECODES, OPCODES } from "../util/Constants";
+import { Send } from "../util/Send";
import { genSessionId } from "../util/SessionUtils";
-import { setupListener } from "../listener/listener";
-import { IdentifySchema } from "../schema/Identify";
+import { check } from "./instanceOf";
// import experiments from "./experiments.json";
const experiments: any = [];
-import { check } from "./instanceOf";
-import { Recipient } from "@fosscord/util";
// TODO: user sharding
// TODO: check privileged intents, if defined in the config
@@ -51,57 +53,49 @@ export async function onIdentify(this: WebSocket, data: Payload) {
const session_id = genSessionId();
this.session_id = session_id; //Set the session of the WebSocket object
- const [user, read_states, members, recipients, session, application] =
- await Promise.all([
- User.findOneOrFail({
- where: { id: this.user_id },
- relations: ["relationships", "relationships.to"],
- select: [...PrivateUserProjection, "relationships"],
- }),
- ReadState.find({ user_id: this.user_id }),
- Member.find({
- where: { id: this.user_id },
- select: MemberPrivateProjection,
- relations: [
- "guild",
- "guild.channels",
- "guild.emojis",
- "guild.emojis.user",
- "guild.roles",
- "guild.stickers",
- "user",
- "roles",
- ],
- }),
- Recipient.find({
- where: { user_id: this.user_id, closed: false },
- relations: [
- "channel",
- "channel.recipients",
- "channel.recipients.user",
- ],
- // TODO: public user selection
- }),
- // save the session and delete it when the websocket is closed
- new Session({
- user_id: this.user_id,
- session_id: session_id,
- // TODO: check if status is only one of: online, dnd, offline, idle
- status: identify.presence?.status || "offline", //does the session always start as online?
- client_info: {
- //TODO read from identity
- client: "desktop",
- os: identify.properties?.os,
- version: 0,
- },
- activities: [],
- }).save(),
- Application.findOne({ id: this.user_id }),
- ]);
+ const [user, read_states, members, recipients, session, application] = await Promise.all([
+ User.findOneOrFail({
+ where: { id: this.user_id },
+ relations: ["relationships", "relationships.to", "settings"],
+ select: [...PrivateUserProjection, "relationships"]
+ }),
+ ReadState.find({ where: { user_id: this.user_id } }),
+ Member.find({
+ where: { id: this.user_id },
+ select: MemberPrivateProjection,
+ relations: ["guild", "guild.channels", "guild.emojis", "guild.emojis.user", "guild.roles", "guild.stickers", "user", "roles"]
+ }),
+ Recipient.find({
+ where: { user_id: this.user_id, closed: false },
+ relations: ["channel", "channel.recipients", "channel.recipients.user"]
+ // TODO: public user selection
+ }),
+ // save the session and delete it when the websocket is closed
+ await OrmUtils.mergeDeep(new Session(), {
+ user_id: this.user_id,
+ session_id: session_id,
+ // TODO: check if status is only one of: online, dnd, offline, idle
+ status: identify.presence?.status || "offline", //does the session always start as online?
+ client_info: {
+ //TODO read from identity
+ client: "desktop",
+ os: identify.properties?.os,
+ version: 0
+ },
+ activities: []
+ }).save(),
+ Application.findOne({ where: { id: this.user_id } })
+ ]);
if (!user) return this.close(CLOSECODES.Authentication_failed);
+ if (!user.settings) {
+ //settings may not exist after updating...
+ user.settings = new UserSettings();
+ user.settings.id = user.id;
+ //await (user.settings as UserSettings).save();
+ }
- if (!identify.intents) identify.intents = BigInt("0x6ffffffff");
+ if (!identify.intents) identify.intents = "30064771071";
this.intents = new Intents(identify.intents);
if (identify.shard) {
this.shard_id = identify.shard[0];
@@ -117,7 +111,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
return this.close(CLOSECODES.Invalid_shard);
}
}
- var users: PublicUser[] = [];
+ let users: PublicUser[] = [];
const merged_members = members.map((x: Member) => {
return [
@@ -125,8 +119,8 @@ export async function onIdentify(this: WebSocket, data: Payload) {
...x,
roles: x.roles.map((x) => x.id),
settings: undefined,
- guild: undefined,
- },
+ guild: undefined
+ }
];
}) as PublicMember[][];
let guilds = members.map((x) => ({ ...x.guild, joined_at: x.joined_at }));
@@ -139,7 +133,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
op: OPCODES.Dispatch,
t: EVENTEnum.GuildCreate,
s: this.sequence++,
- d: guild,
+ d: guild
});
}, 500);
return { id: guild.id, unavailable: true };
@@ -156,9 +150,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
//TODO is this needed? check if users in group dm that are not friends are sent in the READY event
users = users.concat(x.channel.recipients as unknown as User[]);
if (x.channel.isDm()) {
- x.channel.recipients = x.channel.recipients!.filter(
- (x) => x.id !== this.user_id
- );
+ x.channel.recipients = x.channel.recipients!.filter((x) => x.id !== this.user_id);
}
return x.channel;
});
@@ -185,8 +177,8 @@ export async function onIdentify(this: WebSocket, data: Payload) {
user_id: this.user_id,
data: await Session.find({
where: { user_id: this.user_id },
- select: PrivateSessionProjection,
- }),
+ select: PrivateSessionProjection
+ })
} as SessionsReplace);
emitEvent({
event: "PRESENCE_UPDATE",
@@ -195,8 +187,8 @@ export async function onIdentify(this: WebSocket, data: Payload) {
user: await User.getPublicUser(this.user_id),
activities: session.activities,
client_status: session?.client_info,
- status: session.status,
- },
+ status: session.status
+ }
} as PresenceUpdateEvent);
});
@@ -231,7 +223,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
const d: ReadyEventData = {
v: 8,
- application,
+ application: { id: application?.id ?? "", flags: application?.flags ?? 0 }, //TODO: check this code!
user: privateUser,
user_settings: user.settings,
// @ts-ignore
@@ -248,12 +240,12 @@ export async function onIdentify(this: WebSocket, data: Payload) {
read_state: {
entries: read_states,
partial: false,
- version: 304128,
+ version: 304128
},
user_guild_settings: {
entries: user_guild_settings_entries,
partial: false, // TODO partial
- version: 642,
+ version: 642
},
private_channels: channels,
session_id: session_id,
@@ -261,8 +253,8 @@ export async function onIdentify(this: WebSocket, data: Payload) {
connected_accounts: [], // TODO
consents: {
personalization: {
- consented: false, // TODO
- },
+ consented: false // TODO
+ }
},
country_code: user.settings.locale,
friend_suggestion_count: 0, // TODO
@@ -270,7 +262,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
experiments: experiments, // TODO
guild_join_requests: [], // TODO what is this?
users: users.filter((x) => x).unique(),
- merged_members: merged_members,
+ merged_members: merged_members
// shard // TODO: only for user sharding
};
@@ -279,7 +271,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
op: OPCODES.Dispatch,
t: EVENTEnum.Ready,
s: this.sequence++,
- d,
+ d
});
//TODO send READY_SUPPLEMENTAL
diff --git a/gateway/src/opcodes/LazyRequest.ts b/src/gateway/opcodes/LazyRequest.ts
index 7503ee61..ea69779e 100644
--- a/gateway/src/opcodes/LazyRequest.ts
+++ b/src/gateway/opcodes/LazyRequest.ts
@@ -1,12 +1,8 @@
-import { getPermission, listenEvent, Member, Role } from "@fosscord/util";
-import { LazyRequest } from "../schema/LazyRequest";
-import { Send } from "../util/Send";
+import { handlePresenceUpdate, Payload, WebSocket } from "@fosscord/gateway";
+import { getOrInitialiseDatabase, getPermission, LazyRequest, listenEvent, Member, Role } from "@fosscord/util";
import { OPCODES } from "../util/Constants";
-import { WebSocket, Payload, handlePresenceUpdate } from "@fosscord/gateway";
+import { Send } from "../util/Send";
import { check } from "./instanceOf";
-import "missing-native-js-functions";
-import { getRepository } from "typeorm";
-import "missing-native-js-functions";
// TODO: only show roles/members that have access to this channel
// TODO: config: to list all members (even those who are offline) sorted by role, or just those who are online
@@ -17,17 +13,18 @@ async function getMembers(guild_id: string, range: [number, number]) {
throw new Error("range is not a valid array");
}
// TODO: wait for typeorm to implement ordering for .find queries https://github.com/typeorm/typeorm/issues/2620
+ // TODO: rewrite this, released in 0.3.0
- let members = await getRepository(Member)
+ let members: Member[] = await (
+ await getOrInitialiseDatabase()
+ )
+ .getRepository(Member)
.createQueryBuilder("member")
.where("member.guild_id = :guild_id", { guild_id })
.leftJoinAndSelect("member.roles", "role")
.leftJoinAndSelect("member.user", "user")
.leftJoinAndSelect("user.sessions", "session")
- .addSelect(
- "CASE WHEN session.status = 'offline' THEN 0 ELSE 1 END",
- "_status"
- )
+ .addSelect("CASE WHEN session.status = 'offline' THEN 0 ELSE 1 END", "_status")
.orderBy("role.position", "DESC")
.addOrderBy("_status", "DESC")
.addOrderBy("user.username", "ASC")
@@ -46,21 +43,17 @@ async function getMembers(guild_id: string, range: [number, number]) {
for (const role of member_roles) {
// @ts-ignore
- const [role_members, other_members] = partition(members, (m: Member) =>
- m.roles.find((r) => r.id === role.id)
- );
+ const [role_members, other_members] = partition(members, (m: Member) => m.roles.find((r) => r.id === role.id));
const group = {
count: role_members.length,
- id: role.id === guild_id ? "online" : role.id,
+ id: role.id === guild_id ? "online" : role.id
};
items.push({ group });
groups.push(group);
for (const member of role_members) {
- const roles = member.roles
- .filter((x: Role) => x.id !== guild_id)
- .map((x: Role) => x.id);
+ const roles = member.roles.filter((x: Role) => x.id !== guild_id).map((x: Role) => x.id);
const session = member.user.sessions.first();
@@ -73,10 +66,10 @@ async function getMembers(guild_id: string, range: [number, number]) {
presence: {
...session,
activities: session?.activities || [],
- user: { id: member.user.id },
- },
- },
- }
+ user: { id: member.user.id }
+ }
+ }
+ };
if (!member?.user?.sessions || !member.user.sessions.length) {
offlineItems.push(item);
@@ -92,7 +85,7 @@ async function getMembers(guild_id: string, range: [number, number]) {
if (offlineItems.length) {
const group = {
count: offlineItems.length,
- id: "offline",
+ id: "offline"
};
items.push({ group });
groups.push(group);
@@ -104,7 +97,7 @@ async function getMembers(guild_id: string, range: [number, number]) {
items,
groups,
range,
- members: items.map((x) => 'member' in x ? x.member : undefined).filter(x => !!x),
+ members: items.map((x) => ("member" in x ? x.member : undefined)).filter((x) => !!x)
};
}
@@ -122,7 +115,7 @@ export async function onLazyRequest(this: WebSocket, { d }: Payload) {
const ranges = channels![channel_id];
if (!Array.isArray(ranges)) throw new Error("Not a valid Array");
- const member_count = await Member.count({ guild_id });
+ const member_count = await Member.count({ where: { guild_id } });
const ops = await Promise.all(ranges.map((x) => getMembers(guild_id, x)));
// TODO: unsubscribe member_events that are not in op.members
@@ -131,11 +124,7 @@ export async function onLazyRequest(this: WebSocket, { d }: Payload) {
op.members.forEach(async (member) => {
if (this.events[member.user.id]) return; // already subscribed as friend
if (this.member_events[member.user.id]) return; // already subscribed in member list
- this.member_events[member.user.id] = await listenEvent(
- member.user.id,
- handlePresenceUpdate.bind(this),
- this.listen_options
- );
+ this.member_events[member.user.id] = await listenEvent(member.user.id, handlePresenceUpdate.bind(this), this.listen_options);
});
});
@@ -147,7 +136,7 @@ export async function onLazyRequest(this: WebSocket, { d }: Payload) {
ops: ops.map((x) => ({
items: x.items,
op: "SYNC",
- range: x.range,
+ range: x.range
})),
online_count: member_count,
member_count,
@@ -156,8 +145,8 @@ export async function onLazyRequest(this: WebSocket, { d }: Payload) {
groups: ops
.map((x) => x.groups)
.flat()
- .unique(),
- },
+ .unique()
+ }
});
}
@@ -166,9 +155,7 @@ function partition<T>(array: T[], isValid: Function) {
return array.reduce(
// @ts-ignore
([pass, fail], elem) => {
- return isValid(elem)
- ? [[...pass, elem], fail]
- : [pass, [...fail, elem]];
+ return isValid(elem) ? [[...pass, elem], fail] : [pass, [...fail, elem]];
},
[[], []]
);
diff --git a/gateway/src/opcodes/PresenceUpdate.ts b/src/gateway/opcodes/PresenceUpdate.ts
index 415df6ee..ad712234 100644
--- a/gateway/src/opcodes/PresenceUpdate.ts
+++ b/src/gateway/opcodes/PresenceUpdate.ts
@@ -1,16 +1,12 @@
-import { WebSocket, Payload } from "@fosscord/gateway";
-import { emitEvent, PresenceUpdateEvent, Session, User } from "@fosscord/util";
-import { ActivitySchema } from "../schema/Activity";
+import { Payload, WebSocket } from "@fosscord/gateway";
+import { ActivitySchema, emitEvent, PresenceUpdateEvent, Session, User } from "@fosscord/util";
import { check } from "./instanceOf";
export async function onPresenceUpdate(this: WebSocket, { d }: Payload) {
check.call(this, ActivitySchema, d);
const presence = d as ActivitySchema;
- await Session.update(
- { session_id: this.session_id },
- { status: presence.status, activities: presence.activities }
- );
+ await Session.update({ session_id: this.session_id }, { status: presence.status, activities: presence.activities });
await emitEvent({
event: "PRESENCE_UPDATE",
@@ -19,7 +15,7 @@ export async function onPresenceUpdate(this: WebSocket, { d }: Payload) {
user: await User.getPublicUser(this.user_id),
activities: presence.activities,
client_status: {}, // TODO:
- status: presence.status,
- },
+ status: presence.status
+ }
} as PresenceUpdateEvent);
}
diff --git a/gateway/src/opcodes/RequestGuildMembers.ts b/src/gateway/opcodes/RequestGuildMembers.ts
index b80721dc..b80721dc 100644
--- a/gateway/src/opcodes/RequestGuildMembers.ts
+++ b/src/gateway/opcodes/RequestGuildMembers.ts
diff --git a/gateway/src/opcodes/Resume.ts b/src/gateway/opcodes/Resume.ts
index 42dc586d..f320864b 100644
--- a/gateway/src/opcodes/Resume.ts
+++ b/src/gateway/opcodes/Resume.ts
@@ -1,11 +1,11 @@
-import { WebSocket, Payload } from "@fosscord/gateway";
+import { Payload, WebSocket } from "@fosscord/gateway";
import { Send } from "../util/Send";
export async function onResume(this: WebSocket, data: Payload) {
console.log("Got Resume -> cancel not implemented");
await Send(this, {
op: 9,
- d: false,
+ d: false
});
// return this.close(CLOSECODES.Invalid_session);
diff --git a/gateway/src/opcodes/VoiceStateUpdate.ts b/src/gateway/opcodes/VoiceStateUpdate.ts
index 321e6b17..20502584 100644
--- a/gateway/src/opcodes/VoiceStateUpdate.ts
+++ b/src/gateway/opcodes/VoiceStateUpdate.ts
@@ -1,17 +1,18 @@
-import { VoiceStateUpdateSchema } from "../schema/VoiceStateUpdateSchema";
import { Payload, WebSocket } from "@fosscord/gateway";
-import { genVoiceToken } from "../util/SessionUtils";
-import { check } from "./instanceOf";
import {
Config,
emitEvent,
Guild,
Member,
+ OrmUtils,
Region,
VoiceServerUpdateEvent,
VoiceState,
VoiceStateUpdateEvent,
+ VoiceStateUpdateSchema
} from "@fosscord/util";
+import { genVoiceToken } from "../util/SessionUtils";
+import { check } from "./instanceOf";
// 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.
@@ -19,42 +20,41 @@ export async function onVoiceStateUpdate(this: WebSocket, data: Payload) {
check.call(this, VoiceStateUpdateSchema, data.d);
const body = data.d as VoiceStateUpdateSchema;
+ if (body.guild_id == null) {
+ console.log(`[Gateway] VoiceStateUpdate called with guild_id == null by user ${this.user_id}!`);
+ return;
+ }
+
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,
+ guild_id: voiceState.guild_id
});
}
//The event send by Discord's client on channel leave has both guild_id and channel_id as null
if (body.guild_id === null) body.guild_id = voiceState.guild_id;
- voiceState.assign(body);
+ voiceState = OrmUtils.mergeDeep(voiceState, body);
} catch (error) {
- voiceState = new VoiceState({
+ voiceState = OrmUtils.mergeDeep(new VoiceState(), {
...body,
user_id: this.user_id,
deaf: false,
mute: false,
- suppress: false,
+ suppress: false
});
}
@@ -63,12 +63,11 @@ export async function onVoiceStateUpdate(this: WebSocket, data: Payload) {
//TODO this may fail
voiceState.member = await Member.findOneOrFail({
where: { id: voiceState.user_id, guild_id: voiceState.guild_id },
- relations: ["user", "roles"],
+ 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;
@@ -78,23 +77,19 @@ export async function onVoiceStateUpdate(this: WebSocket, data: Payload) {
emitEvent({
event: "VOICE_STATE_UPDATE",
data: newObj,
- guild_id: voiceState.guild_id,
- } as VoiceStateUpdateEvent),
+ guild_id: voiceState.guild_id
+ } as VoiceStateUpdateEvent)
]);
//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({ where: { 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({
@@ -102,9 +97,9 @@ export async function onVoiceStateUpdate(this: WebSocket, data: Payload) {
data: {
token: voiceState.token,
guild_id: voiceState.guild_id,
- endpoint: guildRegion.endpoint,
+ endpoint: guildRegion.endpoint
},
- guild_id: voiceState.guild_id,
+ guild_id: voiceState.guild_id
} as VoiceServerUpdateEvent);
}
}
diff --git a/gateway/src/opcodes/experiments.json b/src/gateway/opcodes/experiments.json
index 0370b5da..0370b5da 100644
--- a/gateway/src/opcodes/experiments.json
+++ b/src/gateway/opcodes/experiments.json
diff --git a/gateway/src/opcodes/index.ts b/src/gateway/opcodes/index.ts
index 027739db..d5dc7de1 100644
--- a/gateway/src/opcodes/index.ts
+++ b/src/gateway/opcodes/index.ts
@@ -1,4 +1,4 @@
-import { WebSocket, Payload } from "@fosscord/gateway";
+import { Payload, WebSocket } from "@fosscord/gateway";
import { onHeartbeat } from "./Heartbeat";
import { onIdentify } from "./Identify";
import { onLazyRequest } from "./LazyRequest";
@@ -21,5 +21,5 @@ export default {
// 9: Invalid Session
// 10: Hello
// 13: Dm_update
- 14: onLazyRequest,
+ 14: onLazyRequest
};
diff --git a/gateway/src/opcodes/instanceOf.ts b/src/gateway/opcodes/instanceOf.ts
index 6fd50852..95d74963 100644
--- a/gateway/src/opcodes/instanceOf.ts
+++ b/src/gateway/opcodes/instanceOf.ts
@@ -1,5 +1,5 @@
-import { instanceOf } from "lambert-server";
import { WebSocket } from "@fosscord/gateway";
+import { instanceOf } from "@fosscord/util";
import { CLOSECODES } from "../util/Constants";
export function check(this: WebSocket, schema: any, data: any) {
diff --git a/gateway/src/start.ts b/src/gateway/start.ts
index 09a54751..97420d7e 100644
--- a/gateway/src/start.ts
+++ b/src/gateway/start.ts
@@ -1,14 +1,14 @@
process.on("uncaughtException", console.error);
process.on("unhandledRejection", console.error);
-import { Server } from "./Server";
import { config } from "dotenv";
+import { Server } from "./Server";
config();
-var port = Number(process.env.PORT);
+let port = Number(process.env.PORT);
if (isNaN(port)) port = 3002;
const server = new Server({
- port,
+ port
});
server.start();
diff --git a/gateway/src/util/Constants.ts b/src/gateway/util/Constants.ts
index 692f9028..78455ff8 100644
--- a/gateway/src/util/Constants.ts
+++ b/src/gateway/util/Constants.ts
@@ -22,7 +22,7 @@ export enum OPCODES {
Stream_Watch = 20,
Stream_Ping = 21,
Stream_Set_Paused = 22,
- Request_Application_Commands = 24,
+ Request_Application_Commands = 24
}
export enum CLOSECODES {
Unknown_error = 4000,
@@ -39,7 +39,7 @@ export enum CLOSECODES {
Sharding_required,
Invalid_API_version,
Invalid_intent,
- Disallowed_intent,
+ Disallowed_intent
}
export interface Payload {
diff --git a/gateway/src/util/Heartbeat.ts b/src/gateway/util/Heartbeat.ts
index f6871cfe..f6871cfe 100644
--- a/gateway/src/util/Heartbeat.ts
+++ b/src/gateway/util/Heartbeat.ts
diff --git a/gateway/src/util/Send.ts b/src/gateway/util/Send.ts
index c8627b03..7826dd40 100644
--- a/gateway/src/util/Send.ts
+++ b/src/gateway/util/Send.ts
@@ -1,4 +1,4 @@
-var erlpack: any;
+let erlpack: any;
try {
erlpack = require("@yukikaze-bot/erlpack");
} catch (error) {
@@ -7,6 +7,7 @@ try {
import { Payload, WebSocket } from "@fosscord/gateway";
export async function Send(socket: WebSocket, data: Payload) {
+ if (process.env.WS_VERBOSE) console.log(`[Websocket] Outgoing message: ${JSON.stringify(data)}`);
let buffer: Buffer | string;
if (socket.encoding === "etf") buffer = erlpack.pack(data);
// TODO: encode circular object
diff --git a/gateway/src/util/SessionUtils.ts b/src/gateway/util/SessionUtils.ts
index bf854042..c66c7e76 100644
--- a/gateway/src/util/SessionUtils.ts
+++ b/src/gateway/util/SessionUtils.ts
@@ -7,7 +7,5 @@ export function genVoiceToken() {
}
function genRanHex(size: number) {
- return [...Array(size)]
- .map(() => Math.floor(Math.random() * 16).toString(16))
- .join("");
+ return [...Array(size)].map(() => Math.floor(Math.random() * 16).toString(16)).join("");
}
diff --git a/gateway/src/util/WebSocket.ts b/src/gateway/util/WebSocket.ts
index e3313f40..9496da85 100644
--- a/gateway/src/util/WebSocket.ts
+++ b/src/gateway/util/WebSocket.ts
@@ -8,8 +8,8 @@ export interface WebSocket extends WS {
session_id: string;
encoding: "etf" | "json";
compress?: "zlib-stream";
- shard_count?: bigint;
- shard_id?: bigint;
+ shard_count?: number;
+ shard_id?: number;
deflate?: Deflate;
heartbeatTimeout: NodeJS.Timeout;
readyTimeout: NodeJS.Timeout;
diff --git a/gateway/src/util/index.ts b/src/gateway/util/index.ts
index 0be5ecee..a5085228 100644
--- a/gateway/src/util/index.ts
+++ b/src/gateway/util/index.ts
@@ -1,5 +1,5 @@
export * from "./Constants";
+export * from "./Heartbeat";
export * from "./Send";
export * from "./SessionUtils";
-export * from "./Heartbeat";
export * from "./WebSocket";
diff --git a/gateway/src/schema/Activity.ts b/src/util/schemas/ActivitySchema.ts
index e18f66c8..d94557ea 100644
--- a/gateway/src/schema/Activity.ts
+++ b/src/util/schemas/ActivitySchema.ts
@@ -11,7 +11,7 @@ export const ActivitySchema = {
$created_at: Date,
$timestamps: {
$start: Number,
- $end: Number,
+ $end: Number
},
$application_id: String,
$details: String,
@@ -19,28 +19,28 @@ export const ActivitySchema = {
$emoji: {
$name: String,
$id: String,
- $animated: Boolean,
+ $animated: Boolean
},
$party: {
$id: String,
- $size: [Number, Number],
+ $size: [Number, Number]
},
$assets: {
$large_image: String,
$large_text: String,
$small_image: String,
- $small_text: String,
+ $small_text: String
},
$secrets: {
$join: String,
$spectate: String,
- $match: String,
+ $match: String
},
$instance: Boolean,
- $flags: String,
- },
+ $flags: String
+ }
],
- $since: Number, // unix time (in milliseconds) of when the client went idle, or null if the client is not idle
+ $since: Number // unix time (in milliseconds) of when the client went idle, or null if the client is not idle
};
export interface ActivitySchema {
diff --git a/gateway/src/schema/Identify.ts b/src/util/schemas/IdentifySchema.ts
index 21141321..bb5ae0c8 100644
--- a/gateway/src/schema/Identify.ts
+++ b/src/util/schemas/IdentifySchema.ts
@@ -1,8 +1,8 @@
-import { ActivitySchema } from "./Activity";
+import { ActivitySchema } from "./ActivitySchema";
export const IdentifySchema = {
token: String,
- $intents: BigInt, // discord uses a Integer for bitfields we use bigints tho. | instanceOf will automatically convert the Number to a BigInt
+ $intents: String, // discord uses a Integer for bitfields we use bigints tho. | instanceOf will automatically convert the Number to a BigInt
$properties: Object,
// {
// // discord uses $ in the property key for bots, so we need to double prefix it, because instanceOf treats $ (prefix) as a optional key
@@ -33,7 +33,7 @@ export const IdentifySchema = {
$presence: ActivitySchema,
$compress: Boolean,
$large_threshold: Number,
- $shard: [BigInt, BigInt],
+ $shard: [Number, Number],
$guild_subscriptions: Boolean,
$capabilities: Number,
$client_state: {
@@ -41,10 +41,10 @@ export const IdentifySchema = {
$highest_last_message_id: String,
$read_state_version: Number,
$user_guild_settings_version: Number,
- $user_settings_version: undefined,
+ $user_settings_version: undefined
},
$v: Number,
- $version: Number,
+ $version: Number
};
export interface IdentifySchema {
@@ -71,11 +71,11 @@ export interface IdentifySchema {
client_version?: string;
system_locale?: string;
};
- intents?: bigint; // discord uses a Integer for bitfields we use bigints tho. | instanceOf will automatically convert the Number to a BigInt
+ intents?: string; // discord uses a Integer for bitfields we use bigints tho. | instanceOf will automatically convert the Number to a BigInt
presence?: ActivitySchema;
compress?: boolean;
large_threshold?: number;
- shard?: [bigint, bigint];
+ shard?: [number, number];
guild_subscriptions?: boolean;
capabilities?: number;
client_state?: {
diff --git a/gateway/src/schema/LazyRequest.ts b/src/util/schemas/LazyRequestSchema.ts
index 1fe658bb..fbed5c5b 100644
--- a/gateway/src/schema/LazyRequest.ts
+++ b/src/util/schemas/LazyRequestSchema.ts
@@ -15,5 +15,5 @@ export const LazyRequest = {
$typing: Boolean,
$threads: Boolean,
$members: [] as any[],
- $thread_member_lists: [] as any[],
+ $thread_member_lists: [] as any[]
};
|
