diff --git a/src/Server.ts b/src/Server.ts
index 46ff56a3..2f72cc00 100644
--- a/src/Server.ts
+++ b/src/Server.ts
@@ -1,10 +1,9 @@
import "missing-native-js-functions";
import dotenv from "dotenv";
dotenv.config();
-import { db } from "@fosscord/server-util";
+import { Config, db } from "@fosscord/server-util";
import { Server as WebSocketServer } from "ws";
import { Connection } from "./events/Connection";
-import Config from "./util/Config";
// TODO: only listen/start the server if everything got initalized
// https://www.npmjs.com/package/ws use "External HTTP/S server" and listen manually at the end of listen()
@@ -37,8 +36,8 @@ export class Server {
// @ts-ignore
await (db as Promise<Connection>);
await this.setupSchema();
- console.log("[DB] connected");
await Config.init();
+ console.log("[DB] connected");
console.log(`[Gateway] online on 0.0.0.0:${port}`);
}
}
diff --git a/src/events/Message.ts b/src/events/Message.ts
index 2c3305cb..51c5a294 100644
--- a/src/events/Message.ts
+++ b/src/events/Message.ts
@@ -21,6 +21,7 @@ export async function Message(this: WebSocket, buffer: Data) {
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);
diff --git a/src/listener/listener.ts b/src/listener/listener.ts
index 8183f70c..b8ee84fd 100644
--- a/src/listener/listener.ts
+++ b/src/listener/listener.ts
@@ -19,7 +19,7 @@ export interface DispatchOpts {
function getPipeline(this: WebSocket, guilds: string[], channels: string[] = []) {
if (this.shard_count) {
- guilds = guilds.filter((x) => (BigInt(x) >> 22n) % this.shard_count === this.shard_id);
+ guilds = guilds.filter((x) => (BigInt(x) >> 22n) % this.shard_count! === this.shard_id);
}
return [
@@ -37,7 +37,7 @@ function getPipeline(this: WebSocket, guilds: string[], channels: string[] = [])
export async function setupListener(this: WebSocket) {
const user = await UserModel.findOne({ id: this.user_id }).lean().exec();
- var guilds = user.guilds;
+ var guilds = user!.guilds;
const eventStream = new MongooseCache(db.collection("events"), getPipeline.call(this, guilds), {
onlyEvents: true,
@@ -60,7 +60,7 @@ export async function dispatch(this: WebSocket, document: Event, { eventStream,
guilds.push(document.data.id);
eventStream.changeStream(getPipeline.call(this, guilds));
} else if (document.event === "GUILD_DELETE") {
- guilds.remove(document.guild_id);
+ guilds.remove(document.guild_id!);
eventStream.changeStream(getPipeline.call(this, guilds));
} else if (document.event === "CHANNEL_DELETE") channel_id = null;
if (document.guild_id && !this.intents.has("GUILDS")) return;
diff --git a/src/opcodes/Identify.ts b/src/opcodes/Identify.ts
index f31eebfe..0ddc58d1 100644
--- a/src/opcodes/Identify.ts
+++ b/src/opcodes/Identify.ts
@@ -11,6 +11,7 @@ import {
UserModel,
toObject,
EVENTEnum,
+ Config,
} from "@fosscord/server-util";
import { setupListener } from "../listener/listener";
import { IdentifySchema } from "../schema/Identify";
@@ -29,7 +30,8 @@ export async function onIdentify(this: WebSocket, data: Payload) {
const identify: IdentifySchema = data.d;
try {
- var decoded = await checkToken(identify.token); // will throw an error if invalid
+ const { jwtSecret } = Config.get().security;
+ var decoded = await checkToken(identify.token, jwtSecret); // will throw an error if invalid
} catch (error) {
console.error("invalid token", error);
return this.close(CLOSECODES.Authentication_failed);
diff --git a/src/util/Config.ts b/src/util/Config.ts
index eee20e1d..9ceb8cd5 100644
--- a/src/util/Config.ts
+++ b/src/util/Config.ts
@@ -1,21 +1,41 @@
+// @ts-nocheck
import { Config } from "@fosscord/server-util";
-
-export default {
- init() {
- return Config.init({ gateway: DefaultOptions });
- },
- get() {
- return Config.getAll().gateway;
- },
- set(val: any) {
- return Config.setAll({ gateway: val });
- },
- getAll: Config.getAll,
- setAll: Config.setAll,
-};
+import { getConfigPathForFile } from "@fosscord/server-util/dist/util/Config";
+import Ajv, { JSONSchemaType } from "ajv";
export interface DefaultOptions {
endpoint?: string;
+ security: {
+ jwtSecret: string;
+ };
}
-export const DefaultOptions: DefaultOptions = {};
+const schema: JSONSchemaType<DefaultOptions> = {
+ type: "object",
+ properties: {
+ endpoint: {
+ type: "string",
+ nullable: true,
+ },
+ security: {
+ type: "object",
+ properties: {
+ jwtSecret: {
+ type: "string",
+ },
+ },
+ required: ["jwtSecret"],
+ },
+ },
+ required: ["security"],
+};
+
+const ajv = new Ajv();
+const validator = ajv.compile(schema);
+
+const configPath = getConfigPathForFile("fosscord", "gateway", ".json");
+export const gatewayConfig = new Config<DefaultOptions>({
+ path: configPath,
+ schemaValidator: validator,
+ schema: schema,
+});
diff --git a/src/util/Send.ts b/src/util/Send.ts
index 09e947a5..be25ac4f 100644
--- a/src/util/Send.ts
+++ b/src/util/Send.ts
@@ -11,7 +11,7 @@ export async function Send(socket: WebSocket, data: Payload) {
if (socket.encoding === "etf") buffer = erlpack.pack(data);
// TODO: encode circular object
else if (socket.encoding === "json") buffer = JSON.stringify(data);
-
+ else return;
// TODO: compression
if (socket.deflate) {
socket.deflate.write(buffer);
|
